Merge branch '2022-03-29-Inserting-NSP-Questions' into development

RoboTutorLLC · Jun 8, 2023 · 76edb75 · 76edb75
2 parents 4525efd + c3f1613
commit 76edb75
Show file tree

Hide file tree

Showing 34 changed files with 2,098 additions and 174 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,7 +22,6 @@ android {
     // Create a variable called keystorePropertiesFile, and initialize it to your
     // keystore.properties file, in the sample_config_files folder, inside app/src.
     def keystorePropertiesFile = rootProject.file("app/src/sample_config_files/sample_keystore.properties")
-
     // Initialize a new Properties() object called keystoreProperties
     def keystoreProperties = new Properties()
 

diff --git a/app/src/main/assets/tutors/engine_descriptor.json b/app/src/main/assets/tutors/engine_descriptor.json
@@ -298,6 +298,16 @@
       "tutorName": "story_questions",
       "features": "FTR_USER_HEAR:FTR_GEN"
     },
+    "story.nsp.does.hear": {
+      "type": "TUTORVAR_MAP",
+      "tutorName": "story_questions",
+      "features": "FTR_USER_HEAR:FTR_NSP_DOES"
+    },
+    "story.nsp.which.hear": {
+      "type": "TUTORVAR_MAP",
+      "tutorName": "story_questions",
+      "features": "FTR_USER_HEAR:FTR_NSP_WHICH"
+    },
 //    "story.mix.hear": {
 //      "type": "TUTORVAR_MAP",
 //      "tutorName": "story_questions",