5etools-utils 0.16.19 → 0.16.24

package/schema/ua/items.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.29",
+	"version": "1.14.30",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -415,7 +415,9 @@
 						"type": "string",
 						"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 						"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"seeAlsoVehicle": {
 					"type": "array",
@@ -423,7 +425,9 @@
 						"type": "string",
 						"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 						"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"reqAttuneTags": {
 					"$ref": "util.json#/$defs/reqAttuneTags"
@@ -902,7 +906,9 @@
 						"type": "string",
 						"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 						"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"seeAlsoVehicle": {
 					"type": "array",
@@ -910,7 +916,9 @@
 						"type": "string",
 						"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 						"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"reqAttuneTags": {
 					"$ref": "util.json#/$defs/reqAttuneTags"
@@ -1391,7 +1399,9 @@
 								"type": "string",
 								"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 								"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"seeAlsoVehicle": {
 							"type": "array",
@@ -1399,7 +1409,9 @@
 								"type": "string",
 								"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 								"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"reqAttuneTags": {
 							"$ref": "util.json#/$defs/reqAttuneTags"
@@ -1878,7 +1890,9 @@
 						"type": "string",
 						"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 						"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"seeAlsoVehicle": {
 					"type": "array",
@@ -1886,7 +1900,9 @@
 						"type": "string",
 						"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 						"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"reqAttuneTags": {
 					"$ref": "util.json#/$defs/reqAttuneTags"
@@ -2378,7 +2394,9 @@
 								"type": "string",
 								"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 								"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"seeAlsoVehicle": {
 							"type": "array",
@@ -2386,7 +2404,9 @@
 								"type": "string",
 								"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 								"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"reqAttuneTags": {
 							"$ref": "util.json#/$defs/reqAttuneTags"
@@ -2869,7 +2889,9 @@
 								"type": "string",
 								"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 								"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"seeAlsoVehicle": {
 							"type": "array",
@@ -2877,7 +2899,9 @@
 								"type": "string",
 								"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 								"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"reqAttuneTags": {
 							"$ref": "util.json#/$defs/reqAttuneTags"

package/schema/ua/util.json

@@ -3,7 +3,7 @@
 	"$id": "util.json",
 	"title": "Util",
 	"description": "Utility definitions to be used in other schemas.",
-	"version": "1.18.6",
+	"version": "1.19.0",
 	"$defs": {
 		"metaDependenciesArray": {
 			"type": "array",
@@ -2453,8 +2453,8 @@
 		},
 		"dataOptionalfeatureType": {
 			"type": "string",
-			"description": "- AF: Alchemical Formula\n- AI: Artificer Infusion\n- AS: Arcane Shot\n- AS:V1-UA: Arcane Shot, V1 (UA)\n- AS:V2-UA: Arcane Shot, V2 (UA)\n- ED: Elemental Discipline\n- EI: Eldritch Invocation\n- FS:B: Fighting Style; Bard\n- FS:F: Fighting Style; Fighter\n- FS:P: Fighting Style; Paladin\n- FS:R: Fighting Style; Ranger\n- IWM:A: Infernal War Machine Upgrade, Armor\n- IWM:G: Infernal War Machine Upgrade, Gadget\n- IWM:W: Infernal War Machine Variant, Weapon\n- MM: Metamagic\n- MV: Maneuver\n- MV:B: Maneuver, Battle Master\n- MV:C2-UA: Maneuver, Cavalier V2 (UA)\n- OR: Onomancy Resonant\n- OTH: Other\n- PB: Pact Boon\n- RN: Rune Knight Rune\n- RP: Renown Perk\n- SHP:F: Ship Upgrade, Figurehead\n- SHP:H: Ship Upgrade, Hull\n- SHP:M: Ship Upgrade, Movement\n- SHP:O: Ship Upgrade, Miscellaneous\n- SHP:W: Ship Upgrade, Weapon\n- TT: Traveler's Trick",
-			"markdownDescription": "- AF: Alchemical Formula\n- AI: Artificer Infusion\n- AS: Arcane Shot\n- AS:V1-UA: Arcane Shot, V1 (UA)\n- AS:V2-UA: Arcane Shot, V2 (UA)\n- ED: Elemental Discipline\n- EI: Eldritch Invocation\n- FS:B: Fighting Style; Bard\n- FS:F: Fighting Style; Fighter\n- FS:P: Fighting Style; Paladin\n- FS:R: Fighting Style; Ranger\n- IWM:A: Infernal War Machine Upgrade, Armor\n- IWM:G: Infernal War Machine Upgrade, Gadget\n- IWM:W: Infernal War Machine Variant, Weapon\n- MM: Metamagic\n- MV: Maneuver\n- MV:B: Maneuver, Battle Master\n- MV:C2-UA: Maneuver, Cavalier V2 (UA)\n- OR: Onomancy Resonant\n- OTH: Other\n- PB: Pact Boon\n- RN: Rune Knight Rune\n- RP: Renown Perk\n- SHP:F: Ship Upgrade, Figurehead\n- SHP:H: Ship Upgrade, Hull\n- SHP:M: Ship Upgrade, Movement\n- SHP:O: Ship Upgrade, Miscellaneous\n- SHP:W: Ship Upgrade, Weapon\n- TT: Traveler's Trick",
+			"description": "- AF: Alchemical Formula\n- AI: Artificer Infusion\n- AS: Arcane Shot\n- AS:V1-UA: Arcane Shot, V1 (UA)\n- AS:V2-UA: Arcane Shot, V2 (UA)\n- ED: Elemental Discipline\n- EI: Eldritch Invocation\n- FS:B: Fighting Style; Bard\n- FS:F: Fighting Style; Fighter\n- FS:P: Fighting Style; Paladin\n- FS:R: Fighting Style; Ranger\n- MM: Metamagic\n- MV: Maneuver\n- MV:B: Maneuver, Battle Master\n- MV:C2-UA: Maneuver, Cavalier V2 (UA)\n- OR: Onomancy Resonant\n- OTH: Other\n- PB: Pact Boon\n- RN: Rune Knight Rune\n- RP: Renown Perk\n- TT: Traveler's Trick",
+			"markdownDescription": "- AF: Alchemical Formula\n- AI: Artificer Infusion\n- AS: Arcane Shot\n- AS:V1-UA: Arcane Shot, V1 (UA)\n- AS:V2-UA: Arcane Shot, V2 (UA)\n- ED: Elemental Discipline\n- EI: Eldritch Invocation\n- FS:B: Fighting Style; Bard\n- FS:F: Fighting Style; Fighter\n- FS:P: Fighting Style; Paladin\n- FS:R: Fighting Style; Ranger\n- MM: Metamagic\n- MV: Maneuver\n- MV:B: Maneuver, Battle Master\n- MV:C2-UA: Maneuver, Cavalier V2 (UA)\n- OR: Onomancy Resonant\n- OTH: Other\n- PB: Pact Boon\n- RN: Rune Knight Rune\n- RP: Renown Perk\n- TT: Traveler's Trick",
 			"examples": [
 				"ED",
 				"EI",
@@ -2472,6 +2472,18 @@
 				"AS",
 				"PB",
 				"AI",
+				"OR",
+				"RN",
+				"AF",
+				"TT",
+				"RP"
+			]
+		},
+		"dataVehicleUpgradeType": {
+			"type": "string",
+			"description": "- IWM:A: Infernal War Machine Upgrade, Armor\n- IWM:G: Infernal War Machine Upgrade, Gadget\n- IWM:W: Infernal War Machine Variant, Weapon\n- SHP:F: Ship Upgrade, Figurehead\n- SHP:H: Ship Upgrade, Hull\n- SHP:M: Ship Upgrade, Movement\n- SHP:O: Ship Upgrade, Miscellaneous\n- SHP:W: Ship Upgrade, Weapon",
+			"markdownDescription": "- IWM:A: Infernal War Machine Upgrade, Armor\n- IWM:G: Infernal War Machine Upgrade, Gadget\n- IWM:W: Infernal War Machine Variant, Weapon\n- SHP:F: Ship Upgrade, Figurehead\n- SHP:H: Ship Upgrade, Hull\n- SHP:M: Ship Upgrade, Movement\n- SHP:O: Ship Upgrade, Miscellaneous\n- SHP:W: Ship Upgrade, Weapon",
+			"examples": [
 				"SHP:H",
 				"SHP:M",
 				"SHP:W",
@@ -2479,12 +2491,7 @@
 				"SHP:O",
 				"IWM:W",
 				"IWM:A",
-				"IWM:G",
-				"OR",
-				"RN",
-				"AF",
-				"TT",
-				"RP"
+				"IWM:G"
 			]
 		},
 		"dataFeatCategory": {

package/schema/ua/vehicles.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "vehicles.json",
-	"version": "1.9.1",
+	"version": "1.10.2",
 	"type": "object",
 	"$defs": {
 		"vehicleTerrain": {
@@ -203,10 +203,13 @@
 				"upgradeType": {
 					"type": "array",
 					"items": {
-						"$ref": "util.json#/$defs/dataOptionalfeatureType",
-						"type": "string",
-						"pattern": "^(SHP|IWM):.*"
-					}
+						"$ref": "util.json#/$defs/dataVehicleUpgradeType"
+					},
+					"minItems": 1,
+					"uniqueItems": true
+				},
+				"cost": {
+					"$ref": "#/$defs/_vehicleCost"
 				},
 				"hasFluff": {
 					"type": "boolean"
@@ -252,10 +255,13 @@
 						"upgradeType": {
 							"type": "array",
 							"items": {
-								"$ref": "util.json#/$defs/dataOptionalfeatureType",
-								"type": "string",
-								"pattern": "^(SHP|IWM):.*"
-							}
+								"$ref": "util.json#/$defs/dataVehicleUpgradeType"
+							},
+							"minItems": 1,
+							"uniqueItems": true
+						},
+						"cost": {
+							"$ref": "#/$defs/_vehicleCost"
 						},
 						"hasFluff": {
 							"type": "boolean"
@@ -305,10 +311,13 @@
 						"upgradeType": {
 							"type": "array",
 							"items": {
-								"$ref": "util.json#/$defs/dataOptionalfeatureType",
-								"type": "string",
-								"pattern": "^(SHP|IWM):.*"
-							}
+								"$ref": "util.json#/$defs/dataVehicleUpgradeType"
+							},
+							"minItems": 1,
+							"uniqueItems": true
+						},
+						"cost": {
+							"$ref": "#/$defs/_vehicleCost"
 						},
 						"hasFluff": {
 							"type": "boolean"

package/schema/ua-fast/actions.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "actions.json",
-	"version": "1.2.8",
+	"version": "1.2.9",
 	"type": "object",
 	"$defs": {
 		"action": {
@@ -67,7 +67,9 @@
 						"type": "string",
 						"description": "UIDs of \"action\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"disarm|dmg\".",
 						"markdownDescription": "UIDs of "action"s to be linked in a "See Also" footnote.\n\nEx.: "disarm|dmg"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				}
 			},
 			"required": [

package/schema/ua-fast/homebrew.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.14.0",
+	"version": "1.14.1",
 	"type": "object",
 	"description": "Homebrew for 5etools. Should include arrays titled similarly to the main site data, e.g. `spell` or `class`",
 	"$defs": {
@@ -182,6 +182,16 @@
 					},
 					"markdownDescription": "Object names are optional feature "type" shorthands (e.g. "EI" for "Eldritch Invocation" which will be displayed in the list view as a sortable column"
 				},
+				"vehicleUpgradeTypes": {
+					"type": "object",
+					"description": "Object names are vehicle upgrade \"type\" shorthands (e.g. \"SHP:H\" for \"Ship Upgrade, Hull\" which will be displayed in the list view as a sortable column",
+					"patternProperties": {
+						".*": {
+							"type": "string"
+						}
+					},
+					"markdownDescription": "Object names are vehicle upgrade "type" shorthands (e.g. "SHP:H" for "Ship Upgrade, Hull" which will be displayed in the list view as a sortable column"
+				},
 				"featCategories": {
 					"type": "object",
 					"description": "Object names are feat \"category\" shorthands (e.g. \"O\" for \"Origin\" which will be displayed in the list view as a sortable column",

package/schema/ua-fast/items.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.29",
+	"version": "1.14.30",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -415,7 +415,9 @@
 						"type": "string",
 						"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 						"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"seeAlsoVehicle": {
 					"type": "array",
@@ -423,7 +425,9 @@
 						"type": "string",
 						"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 						"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"reqAttuneTags": {
 					"$ref": "util.json#/$defs/reqAttuneTags"
@@ -902,7 +906,9 @@
 						"type": "string",
 						"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 						"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"seeAlsoVehicle": {
 					"type": "array",
@@ -910,7 +916,9 @@
 						"type": "string",
 						"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 						"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"reqAttuneTags": {
 					"$ref": "util.json#/$defs/reqAttuneTags"
@@ -1391,7 +1399,9 @@
 								"type": "string",
 								"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 								"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"seeAlsoVehicle": {
 							"type": "array",
@@ -1399,7 +1409,9 @@
 								"type": "string",
 								"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 								"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"reqAttuneTags": {
 							"$ref": "util.json#/$defs/reqAttuneTags"
@@ -1878,7 +1890,9 @@
 						"type": "string",
 						"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 						"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"seeAlsoVehicle": {
 					"type": "array",
@@ -1886,7 +1900,9 @@
 						"type": "string",
 						"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 						"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-					}
+					},
+					"minItems": 1,
+					"uniqueItems": true
 				},
 				"reqAttuneTags": {
 					"$ref": "util.json#/$defs/reqAttuneTags"
@@ -2378,7 +2394,9 @@
 								"type": "string",
 								"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 								"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"seeAlsoVehicle": {
 							"type": "array",
@@ -2386,7 +2404,9 @@
 								"type": "string",
 								"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 								"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"reqAttuneTags": {
 							"$ref": "util.json#/$defs/reqAttuneTags"
@@ -2869,7 +2889,9 @@
 								"type": "string",
 								"description": "UIDs of \"deck\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"deck of many things|dmg\".",
 								"markdownDescription": "UIDs of "deck"s to be linked in a "See Also" footnote.\n\nEx.: "deck of many things|dmg"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"seeAlsoVehicle": {
 							"type": "array",
@@ -2877,7 +2899,9 @@
 								"type": "string",
 								"description": "UIDs of \"vehicle\"s to be linked in a \"See Also\" footnote.\n\nEx.: \"rowboat|gos\".",
 								"markdownDescription": "UIDs of "vehicle"s to be linked in a "See Also" footnote.\n\nEx.: "rowboat|gos"."
-							}
+							},
+							"minItems": 1,
+							"uniqueItems": true
 						},
 						"reqAttuneTags": {
 							"$ref": "util.json#/$defs/reqAttuneTags"

package/schema/ua-fast/util.json

@@ -3,7 +3,7 @@
 	"$id": "util.json",
 	"title": "Util",
 	"description": "Utility definitions to be used in other schemas.",
-	"version": "1.18.6",
+	"version": "1.19.0",
 	"$defs": {
 		"metaDependenciesArray": {
 			"type": "array",
@@ -2453,8 +2453,8 @@
 		},
 		"dataOptionalfeatureType": {
 			"type": "string",
-			"description": "- AF: Alchemical Formula\n- AI: Artificer Infusion\n- AS: Arcane Shot\n- AS:V1-UA: Arcane Shot, V1 (UA)\n- AS:V2-UA: Arcane Shot, V2 (UA)\n- ED: Elemental Discipline\n- EI: Eldritch Invocation\n- FS:B: Fighting Style; Bard\n- FS:F: Fighting Style; Fighter\n- FS:P: Fighting Style; Paladin\n- FS:R: Fighting Style; Ranger\n- IWM:A: Infernal War Machine Upgrade, Armor\n- IWM:G: Infernal War Machine Upgrade, Gadget\n- IWM:W: Infernal War Machine Variant, Weapon\n- MM: Metamagic\n- MV: Maneuver\n- MV:B: Maneuver, Battle Master\n- MV:C2-UA: Maneuver, Cavalier V2 (UA)\n- OR: Onomancy Resonant\n- OTH: Other\n- PB: Pact Boon\n- RN: Rune Knight Rune\n- RP: Renown Perk\n- SHP:F: Ship Upgrade, Figurehead\n- SHP:H: Ship Upgrade, Hull\n- SHP:M: Ship Upgrade, Movement\n- SHP:O: Ship Upgrade, Miscellaneous\n- SHP:W: Ship Upgrade, Weapon\n- TT: Traveler's Trick",
-			"markdownDescription": "- AF: Alchemical Formula\n- AI: Artificer Infusion\n- AS: Arcane Shot\n- AS:V1-UA: Arcane Shot, V1 (UA)\n- AS:V2-UA: Arcane Shot, V2 (UA)\n- ED: Elemental Discipline\n- EI: Eldritch Invocation\n- FS:B: Fighting Style; Bard\n- FS:F: Fighting Style; Fighter\n- FS:P: Fighting Style; Paladin\n- FS:R: Fighting Style; Ranger\n- IWM:A: Infernal War Machine Upgrade, Armor\n- IWM:G: Infernal War Machine Upgrade, Gadget\n- IWM:W: Infernal War Machine Variant, Weapon\n- MM: Metamagic\n- MV: Maneuver\n- MV:B: Maneuver, Battle Master\n- MV:C2-UA: Maneuver, Cavalier V2 (UA)\n- OR: Onomancy Resonant\n- OTH: Other\n- PB: Pact Boon\n- RN: Rune Knight Rune\n- RP: Renown Perk\n- SHP:F: Ship Upgrade, Figurehead\n- SHP:H: Ship Upgrade, Hull\n- SHP:M: Ship Upgrade, Movement\n- SHP:O: Ship Upgrade, Miscellaneous\n- SHP:W: Ship Upgrade, Weapon\n- TT: Traveler's Trick",
+			"description": "- AF: Alchemical Formula\n- AI: Artificer Infusion\n- AS: Arcane Shot\n- AS:V1-UA: Arcane Shot, V1 (UA)\n- AS:V2-UA: Arcane Shot, V2 (UA)\n- ED: Elemental Discipline\n- EI: Eldritch Invocation\n- FS:B: Fighting Style; Bard\n- FS:F: Fighting Style; Fighter\n- FS:P: Fighting Style; Paladin\n- FS:R: Fighting Style; Ranger\n- MM: Metamagic\n- MV: Maneuver\n- MV:B: Maneuver, Battle Master\n- MV:C2-UA: Maneuver, Cavalier V2 (UA)\n- OR: Onomancy Resonant\n- OTH: Other\n- PB: Pact Boon\n- RN: Rune Knight Rune\n- RP: Renown Perk\n- TT: Traveler's Trick",
+			"markdownDescription": "- AF: Alchemical Formula\n- AI: Artificer Infusion\n- AS: Arcane Shot\n- AS:V1-UA: Arcane Shot, V1 (UA)\n- AS:V2-UA: Arcane Shot, V2 (UA)\n- ED: Elemental Discipline\n- EI: Eldritch Invocation\n- FS:B: Fighting Style; Bard\n- FS:F: Fighting Style; Fighter\n- FS:P: Fighting Style; Paladin\n- FS:R: Fighting Style; Ranger\n- MM: Metamagic\n- MV: Maneuver\n- MV:B: Maneuver, Battle Master\n- MV:C2-UA: Maneuver, Cavalier V2 (UA)\n- OR: Onomancy Resonant\n- OTH: Other\n- PB: Pact Boon\n- RN: Rune Knight Rune\n- RP: Renown Perk\n- TT: Traveler's Trick",
 			"examples": [
 				"ED",
 				"EI",
@@ -2472,6 +2472,18 @@
 				"AS",
 				"PB",
 				"AI",
+				"OR",
+				"RN",
+				"AF",
+				"TT",
+				"RP"
+			]
+		},
+		"dataVehicleUpgradeType": {
+			"type": "string",
+			"description": "- IWM:A: Infernal War Machine Upgrade, Armor\n- IWM:G: Infernal War Machine Upgrade, Gadget\n- IWM:W: Infernal War Machine Variant, Weapon\n- SHP:F: Ship Upgrade, Figurehead\n- SHP:H: Ship Upgrade, Hull\n- SHP:M: Ship Upgrade, Movement\n- SHP:O: Ship Upgrade, Miscellaneous\n- SHP:W: Ship Upgrade, Weapon",
+			"markdownDescription": "- IWM:A: Infernal War Machine Upgrade, Armor\n- IWM:G: Infernal War Machine Upgrade, Gadget\n- IWM:W: Infernal War Machine Variant, Weapon\n- SHP:F: Ship Upgrade, Figurehead\n- SHP:H: Ship Upgrade, Hull\n- SHP:M: Ship Upgrade, Movement\n- SHP:O: Ship Upgrade, Miscellaneous\n- SHP:W: Ship Upgrade, Weapon",
+			"examples": [
 				"SHP:H",
 				"SHP:M",
 				"SHP:W",
@@ -2479,12 +2491,7 @@
 				"SHP:O",
 				"IWM:W",
 				"IWM:A",
-				"IWM:G",
-				"OR",
-				"RN",
-				"AF",
-				"TT",
-				"RP"
+				"IWM:G"
 			]
 		},
 		"dataFeatCategory": {

package/schema/ua-fast/vehicles.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "vehicles.json",
-	"version": "1.9.1",
+	"version": "1.10.2",
 	"type": "object",
 	"$defs": {
 		"vehicleTerrain": {
@@ -203,10 +203,13 @@
 				"upgradeType": {
 					"type": "array",
 					"items": {
-						"$ref": "util.json#/$defs/dataOptionalfeatureType",
-						"type": "string",
-						"pattern": "^(SHP|IWM):.*"
-					}
+						"$ref": "util.json#/$defs/dataVehicleUpgradeType"
+					},
+					"minItems": 1,
+					"uniqueItems": true
+				},
+				"cost": {
+					"$ref": "#/$defs/_vehicleCost"
 				},
 				"hasFluff": {
 					"type": "boolean"
@@ -252,10 +255,13 @@
 						"upgradeType": {
 							"type": "array",
 							"items": {
-								"$ref": "util.json#/$defs/dataOptionalfeatureType",
-								"type": "string",
-								"pattern": "^(SHP|IWM):.*"
-							}
+								"$ref": "util.json#/$defs/dataVehicleUpgradeType"
+							},
+							"minItems": 1,
+							"uniqueItems": true
+						},
+						"cost": {
+							"$ref": "#/$defs/_vehicleCost"
 						},
 						"hasFluff": {
 							"type": "boolean"
@@ -305,10 +311,13 @@
 						"upgradeType": {
 							"type": "array",
 							"items": {
-								"$ref": "util.json#/$defs/dataOptionalfeatureType",
-								"type": "string",
-								"pattern": "^(SHP|IWM):.*"
-							}
+								"$ref": "util.json#/$defs/dataVehicleUpgradeType"
+							},
+							"minItems": 1,
+							"uniqueItems": true
+						},
+						"cost": {
+							"$ref": "#/$defs/_vehicleCost"
 						},
 						"hasFluff": {
 							"type": "boolean"