civilopediaText.json array-ized, since it's common *as an array*

This commit is contained in:
Yair Morgenstern
2023-09-22 10:36:51 +03:00
parent 8678e4eeda
commit 8ccee2e862
3 changed files with 24 additions and 69 deletions

View File

@ -14,14 +14,9 @@
"happiness": { "type": "number" }, "happiness": { "type": "number" },
"faith": { "type": "number" }, "faith": { "type": "number" },
"uniques": { "uniques": { "$ref": "https://raw.githubusercontent.com/yairm210/Unciv/master/docs/Modders/schemas/uniques.json" },
"type": "array", "civilopediaText": { "$ref": "https://raw.githubusercontent.com/yairm210/Unciv/master/docs/Modders/schemas/civilopediaText.json" },
"items": { "type": "string" }
},
"civilopediaText": {
"type": "array",
"items": { "$ref": "#/definitions/civilopediaText"}
},
"requiredTech": { "type": "string" }, "requiredTech": { "type": "string" },
"cost": { "type": "number" }, "cost": { "type": "number" },
"maintenance": { "type": "number" }, "maintenance": { "type": "number" },
@ -54,26 +49,5 @@
"name" "name"
], ],
"additionalProperties": false "additionalProperties": false
},
"definitions": {
"civilopediaText": {
"type": "object",
"properties": {
"text": { "type": "string" },
"link": { "type": "string" },
"icon": { "type": "string" },
"extraImage": { "type": "string" },
"imageSize": { "type": "number" },
"size": { "type": "number" },
"header": { "type": "number" },
"indent": { "type": "number" },
"padding": { "type": "number" },
"color": { "type": "string" },
"separator": { "type": "boolean" },
"starred": { "type": "boolean" },
"centered": { "type": "boolean" },
"iconCrossed": { "type": "boolean" }
}
}
} }
} }

View File

@ -1,19 +1,22 @@
{ {
"type": "object", "type": "array",
"properties": { "items": {
"text": { "type": "string" }, "type": "object",
"link": { "type": "string" }, "properties": {
"icon": { "type": "string" }, "text": { "type": "string" },
"extraImage": { "type": "string" }, "link": { "type": "string" },
"imageSize": { "type": "number" }, "icon": { "type": "string" },
"size": { "type": "number" }, "extraImage": { "type": "string" },
"header": { "type": "number" }, "imageSize": { "type": "number" },
"indent": { "type": "number" }, "size": { "type": "number" },
"padding": { "type": "number" }, "header": { "type": "number" },
"color": { "type": "string" }, "indent": { "type": "number" },
"separator": { "type": "boolean" }, "padding": { "type": "number" },
"starred": { "type": "boolean" }, "color": { "type": "string" },
"centered": { "type": "boolean" }, "separator": { "type": "boolean" },
"iconCrossed": { "type": "boolean" } "starred": { "type": "boolean" },
"centered": { "type": "boolean" },
"iconCrossed": { "type": "boolean" }
}
} }
} }

View File

@ -26,7 +26,7 @@
"uniqueTo": { "type": "string" }, "uniqueTo": { "type": "string" },
"replaces": { "type": "string" }, "replaces": { "type": "string" },
"uniques": { "$ref": "#/definitions/uniques" }, "uniques": { "$ref": "https://raw.githubusercontent.com/yairm210/Unciv/master/docs/Modders/schemas/uniques.json" },
"promotions": { "promotions": {
"type": "array", "type": "array",
@ -36,10 +36,7 @@
"attackSound": { "type": "string" }, "attackSound": { "type": "string" },
"replacementTextForUniques": { "type": "string" }, "replacementTextForUniques": { "type": "string" },
"civilopediaText": { "civilopediaText": { "$ref": "https://raw.githubusercontent.com/yairm210/Unciv/master/docs/Modders/schemas/civilopediaText.json" }
"type": "array",
"items": { "$ref": "#/definitions/civilopediaText"}
}
}, },
"required": [ "required": [
"name", "unitType" "name", "unitType"
@ -50,25 +47,6 @@
"uniques": { "uniques": {
"type": "array", "type": "array",
"items": { "type": "string" } "items": { "type": "string" }
},
"civilopediaText": {
"type": "object",
"properties": {
"text": { "type": "string" },
"link": { "type": "string" },
"icon": { "type": "string" },
"extraImage": { "type": "string" },
"imageSize": { "type": "number" },
"size": { "type": "number" },
"header": { "type": "number" },
"indent": { "type": "number" },
"padding": { "type": "number" },
"color": { "type": "string" },
"separator": { "type": "boolean" },
"starred": { "type": "boolean" },
"centered": { "type": "boolean" },
"iconCrossed": { "type": "boolean" }
}
} }
} }
} }