Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync dev-stories #493

Merged
merged 99 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
7e0662f
snobbishness =>
odinlake Jun 1, 2024
be1d8ff
snobbishness
odinlake Jun 1, 2024
274849b
fix workflow branch name
odinlake Jun 1, 2024
7a19632
improved 'hoaxes in society' theme
paul-sheridan Jun 6, 2024
948534a
Merge branch 'master' into dev-themes
paul-sheridan Jun 6, 2024
ba98754
dummy change to trigger merge
odinlake Jun 6, 2024
529842b
dummy change to trigger merge
odinlake Jun 6, 2024
c7b2f36
dummy change to trigger merge
odinlake Jun 6, 2024
fb1f7c5
Merge branch 'master' into dev-themes
odinlake Jun 6, 2024
bd49ae0
Merge remote-tracking branch 'origin' into dev-themes
odinlake Jun 6, 2024
887d527
merge proposed themes, with python-totolo (#421)
github-actions[bot] Jun 6, 2024
c42023e
Merge branch 'master' into dev-themes
odinlake Jun 7, 2024
d82cf38
Merge branch 'master' into dev-themes
paul-sheridan Jun 7, 2024
c75487b
telepathic ability
odinlake Jun 15, 2024
b332c01
wicked/virtuous married couple split up
odinlake Jun 29, 2024
9c96cd6
curiosity
odinlake Jun 29, 2024
966dbdc
malicious hoaxes in society
odinlake Jun 29, 2024
e75f7f2
merge proposed themes, with python-totolo (#422)
github-actions[bot] Jun 30, 2024
a886d0a
coping with someone who is comporting themself above their station
odinlake Jul 13, 2024
b57e49c
coping with humiliation -> embarrassment
odinlake Jul 13, 2024
ab60491
self-driving vehicle
odinlake Jul 13, 2024
bf8b6ae
coping with someone who is comporting themself above their station
odinlake Aug 22, 2024
71361da
merge proposed themes, with python-totolo (#428)
github-actions[bot] Aug 22, 2024
bb38505
Merge branch 'master' into dev-themes
odinlake Aug 22, 2024
1bcb1fc
Merge branch 'dev-themes' of https://github.com/theme-ontology/themin…
paul-sheridan Aug 23, 2024
524fd10
Merge branch 'master' into dev-themes
paul-sheridan Aug 23, 2024
7c6a16c
theme in story fixes
paul-sheridan Aug 23, 2024
c092b82
proposed theme
paul-sheridan Aug 23, 2024
fab8305
merge proposed themes, with python-totolo (#432)
github-actions[bot] Aug 23, 2024
d29c3c7
defined theme
paul-sheridan Aug 24, 2024
a07f10d
proposed new theme
paul-sheridan Aug 24, 2024
ee3ee41
Merge branch 'master' into dev-themes
odinlake Aug 24, 2024
fe78d63
fix workflow bug
odinlake Aug 24, 2024
4a3b24f
prejudice against those less well off than one's self
odinlake Aug 24, 2024
2b30122
merge proposed themes, with python-totolo (#438)
github-actions[bot] Aug 24, 2024
7666683
Merge branch 'master' into dev-themes
paul-sheridan Aug 25, 2024
49974cf
worked on prejudice themes
paul-sheridan Aug 27, 2024
2909fd3
updated theme descriptions
paul-sheridan Aug 29, 2024
0467781
coping with senility
odinlake Aug 29, 2024
6395d15
various social class prejudices in society
odinlake Aug 31, 2024
72e9265
republic vs empire
odinlake Aug 31, 2024
5c8fc6c
deprecate elitism
odinlake Aug 31, 2024
936fb9e
democracy vs. autocracy
odinlake Sep 7, 2024
3fc26aa
democracy vs. autocracy
odinlake Sep 7, 2024
9b5c3b2
democracy vs. autocracy
odinlake Sep 7, 2024
d89387d
merge proposed themes, with python-totolo (#444)
github-actions[bot] Sep 7, 2024
4c9eb08
Merge branch 'master' into dev-themes
paul-sheridan Sep 7, 2024
3256125
reparented 'the merits of autocracy'
paul-sheridan Sep 13, 2024
1fddb21
coping with the defeat of one's people
odinlake Sep 14, 2024
076acae
bloodsports
odinlake Sep 14, 2024
3c737ee
coping with a maniacal leader
odinlake Oct 5, 2024
cffa07f
too much television is bad for society
odinlake Oct 12, 2024
4bdbaf0
merge proposed themes, with python-totolo (#448)
github-actions[bot] Oct 12, 2024
28f52fd
love is blind
odinlake Oct 19, 2024
47d4d33
merge proposed themes, with python-totolo (#450)
github-actions[bot] Oct 19, 2024
d26a516
conflict fix
paul-sheridan Oct 20, 2024
d32b8e8
specialized certain 'human nature' themes
paul-sheridan Oct 20, 2024
efaeedc
comrades in arms
odinlake Nov 8, 2024
2964df3
merge proposed themes, with python-totolo (#456)
github-actions[bot] Nov 8, 2024
002d44b
sex work
odinlake Nov 9, 2024
5eb8e09
coma
odinlake Nov 9, 2024
c06cbae
merge proposed themes, with python-totolo (#457)
github-actions[bot] Nov 10, 2024
5226d6b
Merge branch 'master' into dev-themes
odinlake Nov 11, 2024
9f2d772
Merge branch 'master' into dev-themes
odinlake Nov 11, 2024
b2879b1
matchmaking
odinlake Nov 23, 2024
c41f025
merge proposed themes, with python-totolo (#460)
github-actions[bot] Nov 25, 2024
eabadce
improved 'what if I were trapped in a work of fiction' theme
paul-sheridan Dec 5, 2024
e2980c6
Merge branch 'master' into dev-themes
paul-sheridan Dec 5, 2024
2430e53
merge proposed themes, with python-totolo (#462)
github-actions[bot] Dec 5, 2024
3f703b4
conflict fix
paul-sheridan Dec 6, 2024
76ae980
to tell the truth vs. to offer a comforting lie
odinlake Dec 7, 2024
72611f2
merge proposed themes, with python-totolo (#465)
github-actions[bot] Dec 8, 2024
fb5b870
renamed 'telling the truth vs. offering a comforting lie' to 'to tell…
paul-sheridan Dec 8, 2024
4991561
merge proposed themes, with python-totolo (#467)
github-actions[bot] Dec 8, 2024
3a74e3f
deleted duplicate theme entry
paul-sheridan Dec 8, 2024
67406ef
Merge branch 'master' into dev-themes
odinlake Dec 8, 2024
43df19a
American Civil War => civil war
odinlake Dec 21, 2024
9c07a6a
what civilian life is like in times of war
odinlake Dec 22, 2024
1b7fb3f
Merge branch 'master' into dev-themes
paul-sheridan Dec 23, 2024
7dab466
child's need to be loved
odinlake Dec 26, 2024
72ff251
life in British colonial India is gone and life in Victorian Britain …
odinlake Dec 28, 2024
911c38c
life in late modern India
odinlake Dec 29, 2024
61ecaee
Merge branch 'master' into dev-themes
paul-sheridan Dec 29, 2024
a3853c3
coping with heartbreak {yay or nay?}
odinlake Jan 4, 2025
fb87113
romantic courtship vs. flirtation {TBD}
odinlake Jan 4, 2025
28d8bed
merge proposed themes, with python-totolo (#475)
github-actions[bot] Jan 6, 2025
e88de7f
Merge branch 'master' into dev-themes
odinlake Jan 6, 2025
a68ac05
the -> their in "coping with heartbreak"
odinlake Jan 11, 2025
e7709a5
hallucination of a non-existing person
odinlake Jan 11, 2025
3c2da19
merge proposed themes, with python-totolo (#479)
github-actions[bot] Jan 11, 2025
ffb0070
Merge branch 'master' into dev-themes
odinlake Jan 13, 2025
47da7ac
Merge pull request #488 from theme-ontology/dev-stories
paul-sheridan Jan 16, 2025
93611c7
update destiny definition
odinlake Jan 19, 2025
df6af46
merge proposed themes, with python-totolo
odinlake Jan 19, 2025
81c93b2
Merge pull request #489 from theme-ontology/totolo-merge-proposed
odinlake Jan 19, 2025
186e3f1
Merge pull request #490 from theme-ontology/master
odinlake Jan 19, 2025
094da0f
Merge pull request #491 from theme-ontology/dev-themes
odinlake Jan 19, 2025
09819f9
reformat with python-totolo
odinlake Jan 19, 2025
75c9d52
Merge pull request #492 from theme-ontology/totolo-reformat
odinlake Jan 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions notes/themes/primary.th.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9909,12 +9909,32 @@ destiny
=======

:: Description
The idea that some or all of what will happen to us is predetermined and
cannot be influenced by our decisions.
Destiny, or "fate", is the idea that some or all of what happens to us is
predetermined and cannot be influenced by our decisions. This idea is featured in
the story. It shouldn't be confused with the idea of (backwards) "timetravel"
and usually isn't used in conjunction with the timetravel theme.

:: Parents
folk belief

:: Notes
Typically, destiny is a major theme in stories where a character has been told about
their future through a prophesy or the like, and strives to change some part of it
(generally in vain). It is a minor theme for example when a character mentions the
idea but it has little relevance to the main storyline. Note that words like "destiny"
and "fate" are sometimes used in figures of speech (say "come, destiny awaits" or
"that fateful day") where the speaker is not particularly concerned with the idea
behind the word in question. In such cases it is not used as a theme at all.

Timetravel stories are most often paradoxical but tend to involve a character
actually changing what has, in a sense, already happened. In some stories
a character changes the past futilely in order to escape an event in the present
and it may in some sense look similar to the idea of destiny. However, it is
difficult to make sense of such stories in the context of "a singular predetermined
course of events", which is the basis for the classical idea of "destiny". Therefore,
as a rule of thumb, "destiny" stories tend to be completely separate from
"timetravel" stories.

:: Examples
Data was destined to find his own severed head in tng5x26 "Time's Arrow".

Expand Down
42 changes: 21 additions & 21 deletions notes/themes/timeperiod.th.txt
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,27 @@ family living in the Bengali city Varanasi around 1920.
https://en.wikipedia.org/wiki/Colonial_India


life in late modern India
=========================

:: Description
We are shown a reasonably sincere idea of what life might have been like for
some category of people living on the Indian subcontinent, typically under British
colonial rule, roughly between the years 1750 and 1947.

:: Parents
human life in late modern times
human life in historical Britain
human life in historical Asia

:: Examples
In "Aparajito" (1956), we followed the everyday life of young Apu and his
family living in the Bengali city Varanasi around 1920.

:: References
https://en.wikipedia.org/wiki/Colonial_India


life in late modern Italy
=========================

Expand Down Expand Up @@ -580,24 +601,3 @@ Victorian England.
https://en.wikipedia.org/wiki/Victorian_era


life in late modern India
=========================

:: Description
We are shown a reasonably sincere idea of what life might have been like for
some category of people living on the Indian subcontinent, typically under British
colonial rule, roughly between the years 1750 and 1947.

:: Parents
human life in late modern times
human life in historical Britain
human life in historical Asia

:: Examples
In "Aparajito" (1956), we followed the everyday life of young Apu and his
family living in the Bengali city Varanasi around 1920.

:: References
https://en.wikipedia.org/wiki/Colonial_India


Loading