From 009da20efed17b1f9de111cc78be93fae8326f9d Mon Sep 17 00:00:00 2001 From: Leni Aniva Date: Tue, 12 Sep 2023 16:33:16 -0700 Subject: [PATCH 1/2] Up to 1.4.117 --- wiki/aliens.org | 6 ++++ wiki/chars/akemi-homura.org | 27 +++++++++++++++++ wiki/chars/chitose-yuma.org | 7 +++++ wiki/chars/kaname-madoka.org | 6 ++++ wiki/chars/other.org | 22 +++++--------- wiki/history.org | 47 ++++++++++++++++++++++++++-- wiki/magica.org | 59 ++++++++++++++++++++++++++++++++++++ wiki/places.org | 8 ++++- wiki/settings.org | 51 +------------------------------ wiki/works.org | 9 +++++- 10 files changed, 172 insertions(+), 70 deletions(-) create mode 100644 wiki/aliens.org create mode 100644 wiki/chars/akemi-homura.org create mode 100644 wiki/chars/chitose-yuma.org create mode 100644 wiki/chars/kaname-madoka.org create mode 100644 wiki/magica.org diff --git a/wiki/aliens.org b/wiki/aliens.org new file mode 100644 index 0000000..9678683 --- /dev/null +++ b/wiki/aliens.org @@ -0,0 +1,6 @@ +#+title: Aliens + +(1.1.529) + +At T-20a, the cephalopodan aliens attacked Aurora colony (1.3.659), leaving no +survivors (1.3.671). diff --git a/wiki/chars/akemi-homura.org b/wiki/chars/akemi-homura.org new file mode 100644 index 0000000..7671f31 --- /dev/null +++ b/wiki/chars/akemi-homura.org @@ -0,0 +1,27 @@ +#+title: Akemi Homura 暁美　ほむら + +- Believes in the "Goddess of Hope" who is actually Kaname M. (1.1.539) +- Insignia is the four-pointed star (1.3.347) +- Grants everyone a slower rate of soul gem corruption (1.3.369). + +* Early Life + +Akemi H. never said anything about her childhood and the portrayal in films is +all guesswork (1.3.165). For Tomoe M., Akemi H. could be a totally different +person before her illness (1.3.165). Akemi H. grew up in a church orphanage +(1.3.187). + +The wish she made to become a magical girl is to defend the world (1.3.325) +(1.3.331). + +* During MSY + +- T-20 years ago she leveraged the Goddess of Hope and her charisma to start a + religion (1.1.573). This became the Cult of Hope which was the only living + religion which gained members (1.1.577). +- Had presentations and statistics when she was spearheading MSY (1.1.611) + +* Departure + +- "Left" with no more news (1.1.517) +- Vanished after saving Epsilon Eridani (1.1.581) diff --git a/wiki/chars/chitose-yuma.org b/wiki/chars/chitose-yuma.org new file mode 100644 index 0000000..ff22671 --- /dev/null +++ b/wiki/chars/chitose-yuma.org @@ -0,0 +1,7 @@ +#+title: Chitose Yuma 千才　由麻 + +Involved in MSY (1.1.613) + +- In government (1.1.623) + +* Early Life diff --git a/wiki/chars/kaname-madoka.org b/wiki/chars/kaname-madoka.org new file mode 100644 index 0000000..deefea4 --- /dev/null +++ b/wiki/chars/kaname-madoka.org @@ -0,0 +1,6 @@ +#+title: Kaname Madoka かなめ まどか + +The shape or form of Kaname M. is unknown to the in-universe people (1.3.277). +Kaname M. sacrificed herself for the world (1.3.283). Since Akemi H. was the +only person to witness the goddess in this timeline, she has no way of verifying +her faith in the goddess to other people (1.3.307). diff --git a/wiki/chars/other.org b/wiki/chars/other.org index c6cee57..30b2b8d 100644 --- a/wiki/chars/other.org +++ b/wiki/chars/other.org @@ -59,23 +59,11 @@ Does not trust the government (1.1.625) - Calls Mami "Marshal" (1.1.477) - Calls MSY the "Union" (1.1.589) -** Akemi Homura 暁美　ほむら +** Miki Sayaka -- "Left" with no more news (1.1.517) -- Believs in "Goddess of Hope" (1.1.539) -- 20 years ago she leveraged the Goddess of Hope and her charisma to start a - religion (1.1.573). This became the Cult of Hope which was the only living - religion which gained members (1.1.577). -- Had presentations and statistics when she was spearheading MSY (1.1.611) -- Vanished after saving Epsilon Eridani (1.1.581) +- Deceased (1.3.373) (1.3.379) -** Chitose Yuma 千才　由麻 - -Involved in MSY (1.1.613) - -- In government (1.1.623) - -** Patricia von Rohr +** Patricia von Ruhr Introduced in (1.2.869) (1.2.965). @@ -92,6 +80,10 @@ Primary Mentor (optional): None Introduced in (1.2.877). +** Amelia Giovanni + +Magical girl on the refugee ship from Atlas colony (1.3.743). + * Incubators ** Kyubey diff --git a/wiki/history.org b/wiki/history.org index 2b7383f..7017830 100644 --- a/wiki/history.org +++ b/wiki/history.org @@ -1,6 +1,6 @@ #+title: History -* Volume I +* Volume I: Quantum Entanglement ** Chapter 1: A wish @@ -55,7 +55,48 @@ to keep the matter inside the church (1.2.1076). Sakura K. and Shizuki R. meet the family of Shizuki R. (1.2.1094). -#+begin_verse +#+begin_quote A woman was observed by Shizuki R. in the distance when the demon attack happened (1.2.1144). -#+end_verse +#+end_quote + +** Chapter 3: Mami Watches a Movie, Part 1 + +Mami goes to the theatre to watch the film /Akemi/ in disguise (1.3.57). +The film /Akemi/ is about the life of Akemi H. (1.3.197). + +The film starts by describing Akemi H.'s childhood in an orphanage (1.3.191). +Then she entered a school and was attacked by demons. At this time she had her +encounter with the goddess (1.3.283). She made a wish to defend the world and +became a magical girl (1.3.331). + +The film was not completely in line with reality (1.3.361). After the battle +with demons and Miki S.'s demise, the goddess gave Akemi H. a ribbon (1.3.409). +One major divergence is the following: The film depicted Chitose Y. as in a +clique rivaling the Mitakihara Four. She joined Mitakihara Four after the rest +of her clique died (1.3.447). It is a blatant lie (1.3.489). + +Flashing forward to 10 years later, Tomoe M. and the rest of Mitakihara Four get +into trouble for operating the clandestine magic girl operation and scaring a +neighbour (1.3.509). At this time, Mitakihara Four had to constantly fight to +maintain secrecy (1.3.517). MSY was founded by Akemi H. to streamline efforts of +cooperation and making the lives of magic girls easier (1.3.539). After intense +negotiations, MSY is founded from a simple cooperation agreement in Mitakihara +City. The montage that was shown next outlined MSY's expansion from the city to +the entire world (1.3.645). + +At T-20a, Aurora colony was attacked by cephalopodan aliens with no survivors +(1.3.671). Then Atlas colony was attacked (1.3.681). With the aliens refraining +from orbital bombardments, evacuation ships were let through (1.3.689). An +emergency session of MSY was held which decided to aid the Atlas colony and +others. The Earth's military is no match for the aliens and their next target is +New Athens in Epsilon Eridani (1.3.739). + +** Chapter 4: Mami Watches a Movie, Part 2 + +According to later analysis, the aliens were performing a demonstration attack +(1.4.45). Starships and commercial liners full of magical girls head for Epsilon +Eridani, which raised considerable interest in the general population who are +not familiar with them, and the government investigated (1.4.63). The magic +girls posed as tourists and waited for the signal to attack (1.4.73). Earth's +military and militia were slaughtered by the alien infantry (1.4.113). diff --git a/wiki/magica.org b/wiki/magica.org new file mode 100644 index 0000000..86d5d6f --- /dev/null +++ b/wiki/magica.org @@ -0,0 +1,59 @@ +#+title: Magica + +- Discouragement from parents is illegal but practiced (1.1.377) +- Not bound by travel restrictions (1.1.379) +- Many magic girls died in their first combat assignments or before their first + leaves or received psychological damage (1.1.395). +- Incubator selection is rare and depends on "potential" which is an innate + quality irrespective of wishes (1.1.403) + + All chosen by incubators have a deep personal wish worthy of their soul, but + this is not a sufficient condition. +- Magic girls compose a part of the military and their primary representative is + Mami. +- Operating alone is a violation of regulations (1.1.955) +- Mentorship and team systems between magic girls existed before MSY (1.2.9) +- All magical girls upon enlistment becomes emancipated (1.2.377) and movement + concealed from their parents (1.2.855). +- Emergency mode is mostly useless to magical girls (1.2.261) + +* Soul Gems and Marks +- Fingernail mark (1.2.137) +- Soul Gem can transform its shape (1.3.23) + +* Mahou Shoujo Youkai (MSY) 魔法少女妖怪 + +By the time of the conflict with aliens, MSY has developed into a +State-within-a-State system (1.4.17) with its own military and plans in case of +emergencies (1.4.19). + +An organisation spearheaded by Homura which collects data about battles, grief +cube collections, grief cube usage. Members resisted Homura on insisting +forcefully. (1.1.611) + +This organisation caused the number of deaths in battle to drop and a grief cube +surplus. Sakura K. and Tomoe M. are still executive heads of MSY but leaves +the day-to-day handling to their legates. (1.1.617) + +This organisation was called Union implying that the incubators are the bosses +of magica (1.1.591). + +Grief Cube Audit tallies the grief cubes in reserve (1.1.605). + +** Soul Guard + +The enforcement division of MSY (1.4.83). + +* Cult of Hope + +Uses its infrastructure to handle all data collection for grief cube logistics +(1.1.633). + +* Recruiting + +Recruits were rushed through their contracts (1.2.37). The one-time offer is +probably a lie to aid recruitment (1.2.43). + +* Life on the Frontlines + +- Many magical girls choose other girls as partners (1.2.543). diff --git a/wiki/places.org b/wiki/places.org index 2851283..cccd73b 100644 --- a/wiki/places.org +++ b/wiki/places.org @@ -30,6 +30,12 @@ School is at the 30th floor (1.1.193). * Colonies ** Epsilon Eridani -A human colony; Akemi H. helped to save it (1.1.581). +A human colony /system/; Akemi H. helped to save it (1.1.581). New Athens is +inside this system (1.3.745). +** New Athens +Colony inside Epsilon Eridani (1.3.745) which had a population of 100 million +(1.3.755). ** Wolf 359 A human colony (1.1.675). +** Aurora +First colony to be attacked at T-20a (1.3.651) diff --git a/wiki/settings.org b/wiki/settings.org index d0230c6..1d959f0 100644 --- a/wiki/settings.org +++ b/wiki/settings.org @@ -5,55 +5,6 @@ - Chronometer: Some type of clock (1.1.717) - A nomenclator describes the identity of an individual (1.2.107). -* Magica - -- Discouragement from parents is illegal but practiced (1.1.377) -- Not bound by travel restrictions (1.1.379) -- Many magic girls died in their first combat assignments or before their first - leaves or received psychological damage (1.1.395). -- Incubator selection is rare and depends on "potential" which is an innate - quality irrespective of wishes (1.1.403) - - All chosen by incubators have a deep personal wish worthy of their soul, but - this is not a sufficient condition. -- Magic girls compose a part of the military and their primary representative is - Mami. -- Operating alone is a violation of regulations (1.1.955) -- Mentorship and team systems between magic girls existed before MSY (1.2.9) -- All magical girls upon enlistment becomes emancipated (1.2.377) and movement - concealed from their parents (1.2.855). -- Fingernail mark (1.2.137) -- Emergency mode is mostly useless to magical girls (1.2.261) - -** Mahou Shoujo Youkai (MSY) 魔法少女妖怪 - -An organisation spearheaded by Homura which collects data about battles, grief -cube collections, grief cube usage. Members resisted Homura on insisting -forcefully. (1.1.611) - -This organisation caused the number of deaths in battle to drop and a grief cube -surplus. Sakura K. and Tomoe M. are still executive heads of MSY but leaves -the day-to-day handling to their legates. (1.1.617) - -This organisation was called Union implying that the incubators are the bosses -of magica (1.1.591). - -Grief Cube Audit tallies the grief cubes in reserve (1.1.605). - -** Cult of Hope - -Uses its infrastructure to handle all data collection for grief cube logistics -(1.1.633). - -** Recruiting - -Recruits were rushed through their contracts (1.2.37). The one-time offer is -probably a lie to aid recruitment (1.2.43). - -** Life on the Frontlines - -- Many magical girls choose other girls as partners (1.2.543). - * Demons and Miasmae A miasma is a patch of localised thing which can be cleaned up (1.1.931). Signals @@ -90,7 +41,7 @@ magical girl (1.1.1213). - Food synthesizer produces food (1.1.167) - Images can be called up from optical implants which highlights interest regions and can take pictures (1.1.287). -- Aliens (1.1.529) +- Holoemitter can distort appearance (1.3.29). ** Emergency Packages diff --git a/wiki/works.org b/wiki/works.org index 86bc2bf..ecb45c9 100644 --- a/wiki/works.org +++ b/wiki/works.org @@ -12,6 +12,11 @@ ** /Daughters of the Contract: A Documentary/ - (1.2.7) +* Journals + +** /"Definitive Identification of Akemi Homura's Childhood Home", Journal of MG History/ +(1.3.17) + * Laws/Edicts ** special conscription acts @@ -21,6 +26,8 @@ military 30 years of service (1.1.381). ** Information Restriction Acts - Restricts information about Magica from the populace. Impossible to enforce (1.1.391). + +The government officially maintains that the depletion of soul gems does not +have negative effects on the magical girls (1.3.13). -- 2.44.1 From 5ac418aa026499e7d3926f3d9fc17f1eb33a7d74 Mon Sep 17 00:00:00 2001 From: Leni Aniva Date: Tue, 12 Sep 2023 17:05:34 -0700 Subject: [PATCH 2/2] Up to 1.4 --- wiki/chars/other.org | 13 +++++-------- wiki/chars/tomoe-mami.org | 6 ++++++ wiki/history.org | 24 ++++++++++++++++++++---- wiki/magica.org | 3 ++- wiki/settings.org | 6 ++++++ 5 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 wiki/chars/tomoe-mami.org diff --git a/wiki/chars/other.org b/wiki/chars/other.org index 30b2b8d..7d4b42e 100644 --- a/wiki/chars/other.org +++ b/wiki/chars/other.org @@ -44,14 +44,6 @@ Does not trust the government (1.1.625) * Central -** Tomoe Mami 巴　麻美 - -- Looked to be 19-20yo despite being hundreds of years old. (1.1.307) -- Can converse while holding a motionless face (1.1.351) -- Body is enhanced as for every magical girl (1.1.423) -- Field Marshall (1.1.689) -- Hated recruiting because of the innocence of the girls (1.2.19) - ** Sakura Kyouko 桜　香子 - Chooses to remain 14 (1.1.471) @@ -80,10 +72,15 @@ Primary Mentor (optional): None Introduced in (1.2.877). + +* Colonies + ** Amelia Giovanni Magical girl on the refugee ship from Atlas colony (1.3.743). +** Nadya Antipova +Strongest telekinetic alive at T-20a (1.4.231). * Incubators ** Kyubey diff --git a/wiki/chars/tomoe-mami.org b/wiki/chars/tomoe-mami.org new file mode 100644 index 0000000..ec84d2d --- /dev/null +++ b/wiki/chars/tomoe-mami.org @@ -0,0 +1,6 @@ +#+title: Tomoe Mami 巴　麻美 + +- Looked to be 19-20yo despite being hundreds of years old. (1.1.307) +- Can converse while holding a motionless face (1.1.351) +- Field Marshall (1.1.689) +- Hated recruiting because of the innocence of the girls (1.2.19) diff --git a/wiki/history.org b/wiki/history.org index 7017830..b2be534 100644 --- a/wiki/history.org +++ b/wiki/history.org @@ -55,10 +55,9 @@ to keep the matter inside the church (1.2.1076). Sakura K. and Shizuki R. meet the family of Shizuki R. (1.2.1094). -#+begin_quote -A woman was observed by Shizuki R. in the distance when the demon attack -happened (1.2.1144). -#+end_quote +**Leads** +- A woman was observed by Shizuki R. in the distance when the demon attack + happened (1.2.1144). ** Chapter 3: Mami Watches a Movie, Part 1 @@ -100,3 +99,20 @@ Eridani, which raised considerable interest in the general population who are not familiar with them, and the government investigated (1.4.63). The magic girls posed as tourists and waited for the signal to attack (1.4.73). Earth's military and militia were slaughtered by the alien infantry (1.4.113). + +The order of attack is given by Akemi H. (1.4.121). The military's forces +repositioned to assist the amgical girls (1.4.147). Two battles are happening +simultaneously. One in the orbit and one on the ground (1.4.163). Multiple +orbital strikes land on the surface and one hits Akemi H. (1.4.287). Alien +battalions were destroyed by gestures of Akemi H. (1.4.443). An particle beam +was fired on Akemi H. with little regard to collateral damage to other alien +troops. Akemi H.'s black wings expanded to enormous size and absorbed the beam. +The beam then redirected to orbit (1.4.475). + +After the battle, the government and news wanted to interview the magical girls +leaders (1.4.599). Akemi H. withdrew from the organization after the battle to +look for the goddess (1.4.697). She left with the words +#+begin_quote +If it is your will that I suffer so, if this is what you truly want, then I will +continue to protect this world. I swear it. +#+end_quote diff --git a/wiki/magica.org b/wiki/magica.org index 86d5d6f..5a4af0d 100644 --- a/wiki/magica.org +++ b/wiki/magica.org @@ -9,6 +9,7 @@ All chosen by incubators have a deep personal wish worthy of their soul, but this is not a sufficient condition. +- Body is enhanced as for every magical girl (1.1.423) - Magic girls compose a part of the military and their primary representative is Mami. - Operating alone is a violation of regulations (1.1.955) @@ -54,6 +55,6 @@ Uses its infrastructure to handle all data collection for grief cube logistics Recruits were rushed through their contracts (1.2.37). The one-time offer is probably a lie to aid recruitment (1.2.43). -* Life on the Frontlines +* Life on the Front lines - Many magical girls choose other girls as partners (1.2.543). diff --git a/wiki/settings.org b/wiki/settings.org index 1d959f0..36c39d4 100644 --- a/wiki/settings.org +++ b/wiki/settings.org @@ -5,6 +5,12 @@ - Chronometer: Some type of clock (1.1.717) - A nomenclator describes the identity of an individual (1.2.107). +** Tactical AI system + +All members of the military have one installed (1.4.795). Some of them have a +name. The tactical AI meshed with the neural system and recruited neurons to +grow around it (1.4.809). + * Demons and Miasmae A miasma is a patch of localised thing which can be cleaned up (1.1.931). Signals -- 2.44.1