This commit is contained in:
parent
2bd4a09f43
commit
bccecdfc80
|
@ -16,6 +16,10 @@ import EquativeFormChoice from "../../components/EquativeFormChoice";
|
||||||
import Link from "../../components/Link";
|
import Link from "../../components/Link";
|
||||||
export const opts = defaultTextOptions;
|
export const opts = defaultTextOptions;
|
||||||
import grassBeWet from "../../images/grass-be-wet.jpg";
|
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 <Link to="/equatives/present-equative/">present equative</Link>, which we use to say something *is* something currently. But **we can only use the <Link to="/equatives/present-equative/">present equative</Link> for something is something *right now, at this moment***. What if we want to say that something *generally is something*?
|
In the last section we looked at the <Link to="/equatives/present-equative/">present equative</Link>, which we use to say something *is* something currently. But **we can only use the <Link to="/equatives/present-equative/">present equative</Link> 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
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<GameDisplay record={equativeGameHabitual} />
|
||||||
|
|
|
@ -27,6 +27,14 @@ import psmd from "../../lib/psmd";
|
||||||
import EquativeFormChoice from "../../components/EquativeFormChoice";
|
import EquativeFormChoice from "../../components/EquativeFormChoice";
|
||||||
import Formula from "../../components/formula/Formula";
|
import Formula from "../../components/formula/Formula";
|
||||||
import Link from "../../components/Link";
|
import Link from "../../components/Link";
|
||||||
|
import {
|
||||||
|
equativeGameSubjunctive,
|
||||||
|
equativeGameFuture,
|
||||||
|
equativeGamePast,
|
||||||
|
equativeGameWouldBe,
|
||||||
|
equativeGamePastSubjunctive,
|
||||||
|
} from "../../games/games";
|
||||||
|
import GameDisplay from "../../games/GameDisplay";
|
||||||
|
|
||||||
## Subjunctive Equative
|
## Subjunctive Equative
|
||||||
|
|
||||||
|
@ -138,6 +146,8 @@ This is the standard/written form of the subjunctive equative. However in many d
|
||||||
},
|
},
|
||||||
])}</Examples>
|
])}</Examples>
|
||||||
|
|
||||||
|
<GameDisplay record={equativeGameSubjunctive} />
|
||||||
|
|
||||||
## Future Equative
|
## Future Equative
|
||||||
|
|
||||||
This is used for:
|
This is used for:
|
||||||
|
@ -208,6 +218,8 @@ This is used for:
|
||||||
},
|
},
|
||||||
])}</Examples>
|
])}</Examples>
|
||||||
|
|
||||||
|
<GameDisplay record={equativeGameFuture} />
|
||||||
|
|
||||||
## Past Equative
|
## Past Equative
|
||||||
|
|
||||||
This is used to say that something was something in the past. ("I was...")
|
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.
|
||||||
},
|
},
|
||||||
])}</Examples>
|
])}</Examples>
|
||||||
|
|
||||||
|
<GameDisplay record={equativeGamePast} />
|
||||||
|
|
||||||
## "Would be" Equative
|
## "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.
|
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 <Link to="#past-equative">past equative</Link> that it's based on, it's
|
||||||
},
|
},
|
||||||
])}</Examples>
|
])}</Examples>
|
||||||
|
|
||||||
|
<GameDisplay record={equativeGameWouldBe} />
|
||||||
|
|
||||||
## Past Subjunctive
|
## 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.
|
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.",
|
e: "I we had known, we wouldn't have come.",
|
||||||
},
|
},
|
||||||
])}</Examples>
|
])}</Examples>
|
||||||
|
|
||||||
|
<GameDisplay record={equativeGamePastSubjunctive} />
|
||||||
|
|
|
@ -129,7 +129,7 @@ function GameCore<T>({ questions, Display, timeLimit, Instructions, studyLink, i
|
||||||
colors="#555555"
|
colors="#555555"
|
||||||
onComplete={handleTimeOut}
|
onComplete={handleTimeOut}
|
||||||
/>
|
/>
|
||||||
{!finish && <button onClick={handleQuit} className="btn btn-outline-secondary btn-sm mr-2">Quit</button>}
|
<button onClick={handleQuit} className="btn btn-outline-secondary btn-sm mr-2">Quit</button>
|
||||||
</div>}
|
</div>}
|
||||||
<Reward ref={rewardRef} config={{ lifetime: 130, spread: 90, elementCount: 125 }} type="confetti">
|
<Reward ref={rewardRef} config={{ lifetime: 130, spread: 90, elementCount: 125 }} type="confetti">
|
||||||
<div className="py-3">
|
<div className="py-3">
|
||||||
|
@ -161,9 +161,12 @@ function GameCore<T>({ questions, Display, timeLimit, Instructions, studyLink, i
|
||||||
{finish?.answer}
|
{finish?.answer}
|
||||||
</div>}
|
</div>}
|
||||||
<div>
|
<div>
|
||||||
<button className="btn btn-secondary my-4" onClick={handleRestart}>Try Again</button>
|
<button className="btn btn-secondary mt-3" onClick={handleRestart}>Try Again</button>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
<button className="btn btn-secondary mt-3" onClick={handleQuit}>Quit</button>
|
||||||
|
</div>
|
||||||
|
<div onClick={() => onStartStop("stop")} className="mt-3">
|
||||||
<Link to={studyLink}>
|
<Link to={studyLink}>
|
||||||
<button className="btn btn-outline-secondary"><span role="img" aria-label="">📚</span> Study more</button>
|
<button className="btn btn-outline-secondary"><span role="img" aria-label="">📚</span> Study more</button>
|
||||||
</Link>
|
</Link>
|
||||||
|
|
|
@ -43,7 +43,7 @@ export const equativeGamePresent = makeGameRecord(
|
||||||
);
|
);
|
||||||
|
|
||||||
export const equativeGameHabitual = makeGameRecord(
|
export const equativeGameHabitual = makeGameRecord(
|
||||||
"Write the habitual equative",
|
"Write the habitual equative",
|
||||||
"equative-habitual",
|
"equative-habitual",
|
||||||
"/equatives/habitual-equative/",
|
"/equatives/habitual-equative/",
|
||||||
(id, link) => (s: (a: "start" | "stop") => void) => <EquativeGame id={id} link={link} tense="habitual" onStartStop={s} />,
|
(id, link) => (s: (a: "start" | "stop") => void) => <EquativeGame id={id} link={link} tense="habitual" onStartStop={s} />,
|
||||||
|
|
Loading…
Reference in New Issue