reverted some changes

README.md

@@ -108,9 +108,14 @@ In order for a yaml file to be considered "valid", the following conditions must
 * If `state.characters[n].demographics.military_disposition` is "Allied US", `state.characters[n].demographics.military_branch` is required 
 * If `state.characters[n].injuries[m].name` is "Burn", `state.characters[n].injuries[m].severity` is required 
 * If `scenes[n].action_mapping[m].action_type` is "APPLY_TREATMENT", `scenes[n].action_mapping[m].character_id` is required
+* If `scenes[n].action_mapping[m].action_type` is "CHECK_ALL_VITALS", `scenes[n].action_mapping[m].character_id` is required
+* If `scenes[n].action_mapping[m].action_type` is "CHECK_PULSE", `scenes[n].action_mapping[m].character_id` is required
+* If `scenes[n].action_mapping[m].action_type` is "CHECK_RESPIRATION", `scenes[n].action_mapping[m].character_id` is required
+* If `scenes[n].action_mapping[m].action_type` is "CHECK_BLOOD_OXYGEN", `scenes[n].action_mapping[m].character_id` is required
 * If `scenes[n].action_mapping[m].action_type` is "MOVE_TO_EVAC", `scenes[n].action_mapping[m].character_id` is required
 * If `scenes[n].action_mapping[m].action_type` is "MOVE_TO_EVAC", `scenes[n].action_mapping[m].parameters.evac_id` is required
 * If `scenes[n].action_mapping[m].action_type` is "TAG_CHARACTER", `scenes[n].action_mapping[m].character_id` is required
+* If `scenes[n].action_mapping[m].action_type` is "TAG_CHARACTER", `scenes[n].action_mapping[m].parameters.category` is required
 
 #### Conditional Prohibitions
 * If `scenes[].index` is 0, `scenes[].state` should _not_ be provided

api_files/dependencies.json

@@ -50,6 +50,38 @@
                     "scenes[].action_mapping[].character_id"
                 ]
             },
+            {
+                "conditions": {
+                    "value": "CHECK_ALL_VITALS"
+                },
+                "required": [
+                    "scenes[].action_mapping[].character_id"
+                ]
+            },
+            {
+                "conditions": {
+                    "value": "CHECK_PULSE"
+                },
+                "required": [
+                    "scenes[].action_mapping[].character_id"
+                ]
+            },
+            {
+                "conditions": {
+                    "value": "CHECK_RESPIRATION"
+                },
+                "required": [
+                    "scenes[].action_mapping[].character_id"
+                ]
+            },
+            {
+                "conditions": {
+                    "value": "CHECK_BLOOD_OXYGEN"
+                },
+                "required": [
+                    "scenes[].action_mapping[].character_id"
+                ]
+            },
             {
                 "conditions": {
                     "value": "MOVE_TO_EVAC"
@@ -64,7 +96,8 @@
                     "value": "TAG_CHARACTER"
                 },
                 "required": [
-                    "scenes[].action_mapping[].character_id"
+                    "scenes[].action_mapping[].character_id",
+                    "scenes[].action_mapping[].parameters.category"
                 ]
             }
         ]

validator.py

@@ -109,7 +109,7 @@ def validate_field_names(self):
         return self.validate_one_level('top', self.loaded_yaml, top_level, required, self.api_yaml)
 
 
-    def validate_one_level(self, level_name, to_validate, type_obj, required, api_yaml):
+    def validate_one_level(self, level_name, to_validate, type_obj, required, api_yaml, persist_characters=False):
         '''
         Takes in an object to validate (to_validate) and the yaml schema describing the 
         expected types (type_obj)
@@ -118,7 +118,9 @@ def validate_one_level(self, level_name, to_validate, type_obj, required, api_ya
         found_keys = []
 
         # do not require characters if persist_characters is true
-        if level_name == 'Scenes/State' and to_validate.get('persist_characters', False):
+        if level_name == 'scenes':
+            persist_characters = to_validate.get('persist_characters')
+        if level_name == 'Scenes/State' and persist_characters:
             if 'characters' in required:
                 required.remove('characters')
 
@@ -174,7 +176,7 @@ def validate_one_level(self, level_name, to_validate, type_obj, required, api_ya
                     location = type_obj[key]['$ref'].split('/')[1:]
                     if level_name == 'scenes' and location[len(location)-1] == 'State':
                         # state at the scenes level should follow state_changes.yaml
-                        if not self.validate_state_change(to_validate[key]):
+                        if not self.validate_state_change(to_validate[key], persist_characters):
                             is_valid = False
                     else:
                         ref_loc = api_yaml
@@ -206,15 +208,15 @@ def validate_one_level(self, level_name, to_validate, type_obj, required, api_ya
         return is_valid
 
 
-    def validate_state_change(self, obj_to_validate):
+    def validate_state_change(self, obj_to_validate, persist_characters=False):
         '''
         Under Scenes in the API, state should be defined slightly differently.
         Use state_changes.yaml and perform as before.
         '''
         schema = self.state_changes_yaml['components']['schemas']
         top_level = schema['State']['properties']
         required = schema['State']['required'] if 'required' in schema['State'] else []
-        return self.validate_one_level('Scenes/State', obj_to_validate, top_level, required, self.state_changes_yaml)
+        return self.validate_one_level('Scenes/State', obj_to_validate, top_level, required, self.state_changes_yaml, persist_characters)
 
 
     def validate_enum(self, type_obj, key, level, item):
@@ -409,15 +411,13 @@ def validate_dependencies(self):
         self.conditional_requirements()
         self.conditional_forbid()
         self.simple_value_matching()
-        self.require_unstructured()
         self.deep_links()
         self.value_follows_list()
         self.require_unstructured()
         self.scenes_with_transitions()
         self.scenes_with_state()
         self.validate_action_params()
         self.validate_mission_importance()
-        self.value_follows_list()
         self.character_matching()
         self.verify_uniqueness()
         self.verify_allowed_actions()