Update to OXCE v7.11

OpenXcom · Jan 6, 2024 · 498d9a7 · 498d9a7
1 parent 7d3ed29
commit 498d9a7
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 6 deletions.
diff --git a/schemas/oxce-merge/AlienRace.json b/schemas/oxce-merge/AlienRace.json
@@ -18,9 +18,6 @@
         "retaliationMissionWeights": {
           "$ref": "WeightedOptions.json#/definitions/Map"
         },
-        "retaliationMission": {
-          "type": "string"
-        },
         "membersRandom": {
           "items": {
             "items": {

diff --git a/schemas/oxce-merge/RuleAlienMission.json b/schemas/oxce-merge/RuleAlienMission.json
@@ -17,9 +17,15 @@
         "endlessInfiltration": {
           "type": "boolean"
         },
+        "skipScoutingPhase": {
+          "type": "boolean"
+        },
         "multiUfoRetaliation": {
           "type": "boolean"
         },
+        "multiUfoRetaliationExtra": {
+          "type": "boolean"
+        },
         "ignoreBaseDefenses": {
           "type": "boolean"
         },

diff --git a/schemas/oxce-merge/RuleBaseFacility.json b/schemas/oxce-merge/RuleBaseFacility.json
@@ -9,6 +9,12 @@
         "refNode": {
           "$ref": "RuleBaseFacility.json"
         },
+        "sizeX": {
+          "type": "integer"
+        },
+        "sizeY": {
+          "type": "integer"
+        },
         "spriteEnabled": {
           "type": "boolean"
         },

diff --git a/schemas/oxce-merge/RuleCountry.json b/schemas/oxce-merge/RuleCountry.json
@@ -15,6 +15,18 @@
         "rejoinedXcomEvent": {
           "type": "string"
         },
+        "provideBaseFunc": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
+        "forbiddenBaseFunc": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
         "labelColor": {
           "type": "integer"
         },

diff --git a/schemas/oxce-merge/RuleCraft.json b/schemas/oxce-merge/RuleCraft.json
@@ -109,9 +109,6 @@
             "type": "string"
           }
         },
-        "maxStorageSpace": {
-          "type": "number"
-        },
         "shieldRechargedAtBase": {
           "type": "integer"
         },
@@ -124,6 +121,9 @@
         "useAllStartTiles": {
           "type": "boolean"
         },
+        "defaultAltitude": {
+          "type": "string"
+        },
         "customPreview": {
           "type": "string"
         },

diff --git a/schemas/oxce-merge/RuleCraftStats.json b/schemas/oxce-merge/RuleCraftStats.json
@@ -37,6 +37,18 @@
     "armor": {
       "type": "integer"
     },
+    "soldiers": {
+      "type": "integer"
+    },
+    "vehicles": {
+      "type": "integer"
+    },
+    "maxItems": {
+      "type": "integer"
+    },
+    "maxStorageSpace": {
+      "type": "number"
+    },
     "shieldCapacity": {
       "type": "integer"
     },

diff --git a/schemas/oxce-merge/RuleRegion.json b/schemas/oxce-merge/RuleRegion.json
@@ -9,6 +9,18 @@
         "refNode": {
           "$ref": "RuleRegion.json"
         },
+        "provideBaseFunc": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
+        "forbiddenBaseFunc": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
         "deleteOldAreas": {
           "type": "boolean"
         }

diff --git a/schemas/oxce-merge/RuleResearch.json b/schemas/oxce-merge/RuleResearch.json
@@ -9,6 +9,9 @@
         "refNode": {
           "$ref": "RuleResearch.json"
         },
+        "neededItem": {
+          "type": "string"
+        },
         "spawnedItem": {
           "type": "string"
         },

diff --git a/schemas/oxce-merge/RuleSoldierTransformation.json b/schemas/oxce-merge/RuleSoldierTransformation.json
@@ -151,6 +151,9 @@
     "reset": {
       "type": "boolean"
     },
+    "resetRank": {
+      "type": "boolean"
+    },
     "soldierBonusType": {
       "type": "string"
     }

diff --git a/schemas/oxce-merge/RuleUfo.json b/schemas/oxce-merge/RuleUfo.json
@@ -31,6 +31,9 @@
         "softlockThreshold": {
           "type": "integer"
         },
+        "hitImage": {
+          "type": "string"
+        },
         "missilePower": {
           "type": "integer"
         },
@@ -58,6 +61,9 @@
         "huntAlertSound": {
           "$ref": "ModOffset.json"
         },
+        "hitSound": {
+          "$ref": "ModOffset.json"
+        },
         "tags": {
           "type": "object"
         },