commit bda3bcb361d222fee43c391d68a799d24791ec87
parent f1f1b442e9915c6deeb773885069e5f5590123d4
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date: Tue, 26 May 2020 11:56:34 -0700
Implement regular verb filters.
Diffstat:
2 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/Scripts/Quizzer.js b/Scripts/Quizzer.js
@@ -108,34 +108,49 @@ function ApplyFilter(vocabSet, name) {
value = [];
break;
- case "Nouns":
- io = [[0,1], [1,0]];
- value = [[2, ["Noun"], false]];
+ case "Present non-Regular":
+ io = [[0,5], [0,6], [0,7], [0,8], [0,9]];
+ value = [[4, ["Regular"], true]];
break;
- case "Verbs":
- io = [[0,1], [1,0]];
- value = [[2, ["Verb"], false]];
+ case "Preterite non-Regular":
+ io = [[0,11], [0,12], [0,13], [0,14], [0,15]];
+ value = [[10, ["Regular"], true]];
break;
- case "Adjectives":
- io = [[0,1], [1,0]];
- value = [[2, ["Adjective"], false]];
+ case "Imperfect non-Regular":
+ io = [[0,17], [0,18], [0,19], [0,20], [0,21]];
+ value = [[16, ["Regular"], true]];
break;
- case "Present non-Regular":
+ case "Present Regular":
io = [[0,5], [0,6], [0,7], [0,8], [0,9]];
- value = [[4, ["Irregular", "Stem Changing"], false]];
+ value = [[4, ["Regular"], false]];
break;
- case "Preterite non-Regular":
+ case "Preterite Regular":
io = [[0,11], [0,12], [0,13], [0,14], [0,15]];
- value = [[10, ["Irregular", "Stem Changing", "Orthographic"], false]];
+ value = [[10, ["Regular"], false]];
break;
- case "Imperfect non-Regular":
+ case "Imperfect Regular":
io = [[0,17], [0,18], [0,19], [0,20], [0,21]];
- value = [[16, ["Irregular", "Stem Changing"], false]];
+ value = [[16, ["Regular"], false]];
+ break;
+
+ case "Nouns":
+ io = [[0,1], [1,0]];
+ value = [[2, ["Noun"], false]];
+ break;
+
+ case "Verbs":
+ io = [[0,1], [1,0]];
+ value = [[2, ["Verb"], false]];
+ break;
+
+ case "Adjectives":
+ io = [[0,1], [1,0]];
+ value = [[2, ["Adjective"], false]];
break;
default:
diff --git a/Scripts/Settings.js b/Scripts/Settings.js
@@ -220,7 +220,8 @@ function settingsSetChanged(setName) {
case "Verbs":
items = ["All Definitions", "All Conjugations", "Reverse Conjugations",
"Present Participles", "Present Tense", "Preterite Tense", "Imperfect Tense",
- "Present non-Regular", "Preterite non-Regular", "Imperfect non-Regular"];
+ "Present non-Regular", "Preterite non-Regular", "Imperfect non-Regular",
+ "Present Regular", "Preterite Regular", "Imperfect Regular"];
break;
case "Adjectives":