Fix convoy coordination, AI combat and spectator recovery

tests/test_project_schema.py

@@ -59,6 +59,9 @@ class ProjectSchemaTests(unittest.TestCase):
     def test_menu_extension_cannot_redirect_override_or_add_unreviewed_settings(self):
         mutations = (
             CURRENT.replace('B48C7FA12692DE03', 'FFFFFFFFFFFFFFFF'),
+            CURRENT.replace('A7B19F416E541000', 'FFFFFFFFFFFFFFFF'),
+            CURRENT.replace('50A48858902D5F64', 'FFFFFFFFFFFFFFFF'),
+            CURRENT.replace('Configs/ERR/ObserverInput.conf', 'Configs/Foreign/Input.conf'),
             CURRENT.replace('50C890C996B0A6FC', 'FFFFFFFFFFFFFFFF'),
             CURRENT.replace('Configs/ERR/AdminMenus.conf', 'Configs/Foreign/Menu.conf'),
             CURRENT.replace('MenuConfigs {', 'MenuConfigs +{'),
@@ -104,6 +107,11 @@ class ProjectSchemaTests(unittest.TestCase):
         with self.assertRaises(ValueError): merged.inventory(self.candidate)
 
     def test_source_menu_reference_must_resolve_to_its_owned_resource(self):
+        for name in ('addons/core/Configs/ERR/ObserverInput.conf',):
+            payload = dict(self.payload)
+            payload.pop(name)
+            payload.pop(name+'.meta')
+            with self.assertRaisesRegex(ValueError, 'unresolved or nonvanilla'): bundle.validate(payload, ROOT)
         payload = dict(self.payload)
         payload.pop(MENU_FILE)
         payload.pop(MENU_FILE+'.meta')