From bccecdfc804572caada8d301deb0ce4190542bf0 Mon Sep 17 00:00:00 2001 From: lingdocs <71590811+lingdocs@users.noreply.github.com> Date: Mon, 9 May 2022 13:29:57 -0500 Subject: [PATCH] up --- src/content/equatives/habitual-equative.mdx | 6 ++++++ src/content/equatives/other-equatives.mdx | 18 ++++++++++++++++++ src/games/GameCore.tsx | 7 +++++-- src/games/games.tsx | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/content/equatives/habitual-equative.mdx b/src/content/equatives/habitual-equative.mdx index 5d46a3f..3288273 100644 --- a/src/content/equatives/habitual-equative.mdx +++ b/src/content/equatives/habitual-equative.mdx @@ -16,6 +16,10 @@ import EquativeFormChoice from "../../components/EquativeFormChoice"; import Link from "../../components/Link"; export const opts = defaultTextOptions; import grassBeWet from "../../images/grass-be-wet.jpg"; +import { + equativeGameHabitual, +} from "../../games/games"; +import GameDisplay from "../../games/GameDisplay"; In the last section we looked at the present equative, which we use to say something *is* something currently. But **we can only use the present equative for something is something *right now, at this moment***. What if we want to say that something *generally is something*? @@ -127,3 +131,5 @@ Interestingly, there is also a separate [habitual equative](https://en.wikipedia + + diff --git a/src/content/equatives/other-equatives.mdx b/src/content/equatives/other-equatives.mdx index 67519c8..e5b5e8a 100644 --- a/src/content/equatives/other-equatives.mdx +++ b/src/content/equatives/other-equatives.mdx @@ -27,6 +27,14 @@ import psmd from "../../lib/psmd"; import EquativeFormChoice from "../../components/EquativeFormChoice"; import Formula from "../../components/formula/Formula"; import Link from "../../components/Link"; +import { + equativeGameSubjunctive, + equativeGameFuture, + equativeGamePast, + equativeGameWouldBe, + equativeGamePastSubjunctive, +} from "../../games/games"; +import GameDisplay from "../../games/GameDisplay"; ## Subjunctive Equative @@ -138,6 +146,8 @@ This is the standard/written form of the subjunctive equative. However in many d }, ])} + + ## Future Equative This is used for: @@ -208,6 +218,8 @@ This is used for: }, ])} + + ## Past Equative This is used to say that something was something in the past. ("I was...") @@ -271,6 +283,8 @@ It is usually used in the short form. }, ])} + + ## "Would be" Equative This is used to presume something about the past, to talk about something being something habitually/repeatedly in past, or to talk about the outcomes of hypothetical conditions. @@ -352,6 +366,8 @@ Like the past equative that it's based on, it's }, ])} + + ## Past Subjunctive This is used to talk about something being hypothetically something, or to wish that something were something. ("If I was ...", "If only I was ..."). It is also used for prayers and blessings in some dialects. @@ -421,3 +437,5 @@ export function WithTailChoice() { e: "I we had known, we wouldn't have come.", }, ])} + + diff --git a/src/games/GameCore.tsx b/src/games/GameCore.tsx index e176ef2..4a859c0 100644 --- a/src/games/GameCore.tsx +++ b/src/games/GameCore.tsx @@ -129,7 +129,7 @@ function GameCore({ questions, Display, timeLimit, Instructions, studyLink, i colors="#555555" onComplete={handleTimeOut} /> - {!finish && } + }
@@ -161,9 +161,12 @@ function GameCore({ questions, Display, timeLimit, Instructions, studyLink, i {finish?.answer}
}
- +
+ +
+
onStartStop("stop")} className="mt-3"> diff --git a/src/games/games.tsx b/src/games/games.tsx index 441e89a..3915fd0 100644 --- a/src/games/games.tsx +++ b/src/games/games.tsx @@ -43,7 +43,7 @@ export const equativeGamePresent = makeGameRecord( ); export const equativeGameHabitual = makeGameRecord( - "Write the habitual equative", + "Write the habitual equative", "equative-habitual", "/equatives/habitual-equative/", (id, link) => (s: (a: "start" | "stop") => void) => ,