Update note to I.2 and add battle diagram of I.1

magica.sty

@@ -14,7 +14,7 @@
 \tikzset{
 	Char/.style={
 		draw,rounded corners=3pt,line width=0.5mm,
-		minimum size=15pt,
+		minimum size=10pt,
 		fill=#1
 	},
 	Char/.default={white}, % civilian colour
@@ -34,13 +34,45 @@
 \colorlet{Sayaka}{CornflowerBlue}
 
 \NewDocumentCommand\Magica{ o d() g}{
-	\node[Char=#1] (c) at (#2) {};
+	\node[Char=#1] (char) at (#2) {};
-	\IfNoValueTF{#3}{}{ \node[right=5pt] at (c) {#3}; }
+	\IfNoValueTF{#3}{}{ \node[right=5pt] at (char) {#3}; }
 }
 \NewDocumentCommand\Civilian{ d() g}{
-	\node[Char] (c) at (#1) {};
+	\node[Char] (char) at (#1) {};
-	\IfNoValueTF{#2}{}{ \node[right=5pt] at (c) {#2}; }
+	\IfNoValueTF{#2}{}{ \node[right=5pt] at (char) {#2}; }
 }
-\NewDocumentCommand\Demon{ d() }{
+\NewDocumentCommand\Demon{ o d() }{
-	\node[Char=red!50!white] (c) at (#1) {};
+	\node[Char=red!50, \IfNoValueTF{#1}{}{#1}] (char) at (#2) {};
+}
+\NewDocumentCommand\Annotate{ d() g }{
+	\coordinate (charAnnotate) at (#1);
+	\draw[thin,gray] (char) -- (char |- charAnnotate);
+	\draw[thin,gray] (char |- charAnnotate) -- (charAnnotate)
+		node[midway,above,scale=0.7] {#2};
+}
+
+% Environment objects
+\colorlet{pavement}{gray!90!yellow!20}
+\tikzset{
+	material railing/.style={
+		black!80, line width=2mm,
+	},
+	material wall/.style={
+		black!30, line width=2mm,
+	},
+	material laser/.style={
+		red!80, line width=3px,
+	},
+	material bullet/.style={
+		orange!80, line width=3px, dashed
+	},
+	Magica object turbine/.pic={
+		\node[draw=black,star,star points=3,star point height=10pt,scale=1.5,fill=white]
+			(magica/turbine) {};
+		\draw (magica/turbine) circle (23pt);
+	},
+	Magica object solarpanel/.pic={
+		\filldraw[Blue!80,draw=black] (-0.5,-1) rectangle (0.5,1);
+		\draw[thin,step=0.5] (-0.5,-1) grid (0.5,1);
+	},
 }

notes/char-ryouko.org

@@ -7,6 +7,12 @@
 Her wish of being a magical girl was granted after a near-death encounter with
 demons and miasma (I.1.1285).
 
-Her weapon as a magical girl is a arbalest (crossbow) and can teleport up to
+** Chapter 2
-200km, but cannot telekinesis or teleport objects without teleporting self.
+
-200km is much greater than the standing record of 63km. (I.2)
+Her weapon as a magical girl is a arbalest (crossbow). She can teleport up to
+2000 kg (I.2.281) but cannot telekinesis or teleport objects without teleporting
+self (I.2.289). The maximal range is 200km (I.2.293), which beated previous
+record of 63km (I.2.307). Her teleportation works by manipulating space
+(I.2.325).
+
+Sakura K. was assigned to be her commanding officer (I.2.365).

notes/settings.org

@@ -25,7 +25,7 @@ Friend of Ryouko and foreign exchange student (I.1.209)
 - Exchange student but not very interested in learning languages. She embarked
   on an exchange to get away from family (I.1.835)
 - Describes Earth as same people everywhere (I.1.871)
-- May have romantic feelings towards Ryouko (I.1.895) (I.2)
+- May have romantic feelings towards Ryouko (I.1.895) (I.2.543)
 
 *** Chiaki 智晶
 
@@ -59,6 +59,7 @@ Friend of Ryouko (I.1.209)
 - Can converse while holding a motionless face (I.1.351)
 - Body is enhanced as for every magical girl (I.1.423)
 - Field Marshall (I.1.689)
+- Hated recruiting because of the innocence of the girls (I.2.19)
 
 *** Sakura Kyouko 桜　香子
 
@@ -100,14 +101,14 @@ Has some feud with Fleet Admiral Xing [v2/p80]
 
 * In-Book Items
 
-** Books
+** Books/Documentaries
 
 *** /Universal Guidelines for Middle School Instructors (12th revision)/
 - Mentioned in (I.1.11)
 *** /Daughters of the Contract: A Documentary/
-- Mentioned in [v2/p59]
+- Mentioned in (I.2.7)
 *** /Mahou Shoujo: Their World, Their History (Julian Bradshaw)/
-- Mentioned in [v2/p60]
+- Mentioned in (I.2.15)
 
 ** Laws/Edicts
 
@@ -142,8 +143,10 @@ Impossible to enforce.
 - Magic girls compose a part of the military and their primary representative is
   Mami.
 - Operating alone is a violation of regulations (I.1.955)
-- Mentorship and team systems between magic girls existed before MSY (I.2)
+- Mentorship and team systems between magic girls existed before MSY (I.2.9)
-- All magical girls upon enlistment becomes emancipated (I.2)
+- All magical girls upon enlistment becomes emancipated (I.2.377)
+- Fingernail mark (I.2.137)
+- Emergency mode is mostly useless to magical girls (I.2.261)
 
 *** Mahou Shoujo Youkai (MSY) 魔法少女妖怪
 
@@ -165,6 +168,11 @@ Grief Cube Audit tallies the grief cubes in reserve (I.1.605).
 Uses its infrastructure to handle all data collection for grief cube logistics
 (I.1.633).
 
+*** Recruiting
+
+Recruits were rushed through their contracts (I.2.37). The one-time offer is
+probably a lie (I.2.43) to aid recruitment.
+
 ** Demons and Miasmae
 
 A miasma is a patch of localised thing which can be cleaned up (I.1.931). Signals
@@ -185,8 +193,8 @@ magical girl (I.1.1213).
   about incubator system until the pupils are at age 20. (I.1.9)
 - At Ryuoko's grandmother's time an automatic telescope and cortical implants
   were possible (I.1.63)
-- Clothes are self-cleaning (I.1.29) and robots can do the dressing (I.1.29), both
+- Clothes are self-cleaning (I.1.29) and robots can do the dressing (I.1.29),
-  require money. Bedsheets are self folding (I.1.85)
+  both require money. Bedsheets are self folding (I.1.85)
 - Sleep-suppressing regimen cause people to sleep 0-3h a day for adults.
   Considered unsafe for 14-year-olds (I.1.33).
 - People can talk without moving lips (I.1.35)

v1-a-wish.tex

@@ -4,7 +4,7 @@
 
 \title{To The Stars Battle Diagrams \\ I.1 A Wish}
 \author{Leni Aniva}
-\date{04 July 2023}
+\date{08 July 2023}
 
 \begin{document}
 
@@ -13,32 +13,133 @@
 \begin{frame}
 	\frametitle{I.1.931 - 1109}
 
-	\begin{tikzpicture}[
+	\begin{tikzpicture}
-			Turbine/.style={draw=black,star,star points=3,star point height=10pt,scale=1.5,fill=white},
+		\path[use as bounding box] (-5.5,-4) rectangle (5.5,3);
-			Solar/.style={Blue!80,draw=black},
+		% Background
-		]
+		\filldraw[pavement] (-6,-1) rectangle (5.5,1);
-		\filldraw[black!20] (-5,-1) rectangle (5,1);
+		\filldraw[pavement] (-6,1) rectangle (-5,3);
-		\node[Turbine] (turbine1) at (1,1.5) {};
+		\only<1-3>{
-		\draw (turbine1) circle (23pt);
+		\pic at (1,2) {Magica object turbine};
-		\node[Turbine] (turbine2) at (-1,1.5) {};
+		}
-		\draw (turbine2) circle (23pt);
+		\pic at (-1,2) {Magica object turbine};
-		\node[Turbine] (turbine3) at (-3,1.5) {};
+		\pic at (-3,2) {Magica object turbine};
-		\draw (turbine3) circle (23pt);
+		\pic at (3,2) {Magica object solarpanel};
+		\pic at (4.1,2) {Magica object solarpanel};
+		\draw[material railing] (-4.5,1.2) -- (-4.5,3);
 
-		\filldraw[Solar] (2,1.1) rectangle (4,1.9);
+		\only<1>{
-		\draw[black] (2,1.1) grid (4,1.9);
+		\Magica[ShizukiR](1,-.5)
-		\Magica[ShizukiR](1,0){Shizuki R.}
+		\Annotate($(char)+(1,1)$){Shizuki R.}
-		\Civilian(0,1){Simona}
+		\Civilian(0.3,-.5)
+		\Annotate($(char)+(-1,1)$){Simona}
+		\Demon[semitransparent](2.4,1)
+		}
+		\only<2>{
+			\Magica[ShizukiR](0.7,0)
+			\Civilian(0,0.3)
+			\MilActivity[faction=hostile,main=explosion] (2,-1)
+		}
+		\only<3>{
+			\Magica[ShizukiR](-0.4,0)
+			\Civilian(-0.1,0.3)
+		}
+		\only<4>{
+			\Magica[ShizukiR](-4,2.8)
+			\Civilian(-4,3.2)
+			\MilActivity[faction=hostile,main=explosion] (1,2)
+		}
+
+		\only<2>{
 		\Demon(2,1)
-
+		\Demon[semitransparent](2.6,1)
+		\Demon[semitransparent](3.4,1.2)
 		\MilLand[faction=hostile,
 			main=demon,
-			echelon=squad] (0,-3)
+			echelon=squad] (3,-3)
-		\MilActivity[faction=hostile,main=explosion] (2,-1)
+		}
-		\MilAir[faction=hostile,
+		\only<3>{
+		\Demon(1.5,1)
+		\Demon(2.1,1)
+		\Demon(2.9,1.2)
+		\MilLand[faction=hostile,
 			main=demon,
-			altitude={low}{},
+			echelon=squad] (2.5,-2)
-			echelon=squad,speed leader={110}{1}] (3,-3)
+		}
+		\only<4>{
+		\Demon(1.1,1.1)
+		\Demon(1.8,1)
+		\Demon(2.4,1.2)
+		\MilLand[faction=hostile,
+			main=demon,
+			echelon=squad] (2,-2)
+		}
+	\end{tikzpicture}
+\end{frame}
+
+\begin{frame}
+	\frametitle{I.1.931 - 1109}
+	\begin{tikzpicture}
+		%\path[use as bounding box] (-5.5,-4) rectangle (5.5,3);
+		% Background
+		\filldraw[pavement] (2,-1) rectangle (4,6);
+		\filldraw[pavement] (4,-1) rectangle (7,-.2);
+		\pic at (5.8,1) {Magica object turbine};
+		\draw[material railing] (4.5,0)  -- (4.5,6);
+		\draw[material wall]
+			(0,2) -- (-1,2) -- (-1,-1)
+			(1.8,-1) -- (1.8,2) -- (1,2);
+		\draw[material wall] (1.8,2.6) --  ++(0,1.5) -- ++(-1.5,0) -- ++(0,-1.5) -- cycle;
+
+		\only<1>{
+		\Magica[ShizukiR](3.8,0.5)
+		\Civilian(3.8,0.2)
+		}
+		\only<2>{
+		\Magica[ShizukiR](3.2,1.5)
+		\draw[material laser] (char) -- (6,4);
+		\Civilian(3.3,1.2)
+		}
+		\only<3>{
+		\Magica[ShizukiR](0.9,2.3)
+		\Civilian(1.2,2.3)
+		}
+		\only<4>{
+		\Magica[ShizukiR](1,0.3)
+		\draw[material laser] (char) -- (-.5,4.4);
+		\Civilian(1.2,0.5)
+
+		\Demon (-.2,4.6);
+		\Demon (-.5,4.4);
+		\Demon (-1,3.5);
+		\Demon (1.7,2.2);
+		}
+		\only<5>{
+		\Magica[TomoeM](0.7,0.9) {Tomoe M.}
+
+		\coordinate (emit) at (char.north);
+		\coordinate (centre) at (0.7,0.8);
+		\Demon ($(-.2,4.6)!.1!(centre)$);
+		\draw[material bullet] (emit) -- (char);
+		\Demon ($(-.5,4.4)!.1!(centre)$);
+		\draw[material bullet] (emit) -- (char);
+		\Demon ($(-1,3.5)!.1!(centre)$);
+		\draw[material bullet] (emit) -- (char);
+		\Demon ($(1.7,2.2)!.1!(centre)$);
+		\draw[material bullet] (emit) -- (char);
+		}
+		\onslide<6>{
+		\Magica[TomoeM](0.7,0.9)
+		}
+		\onslide<5->{
+		\Magica[ShizukiR](1,0.3)
+		\Civilian(1.2,0.5)
+		}
+		\MilLand[faction=hostile,
+			main=demon,
+			echelon=squad] (7,5)
+		\MilLand[faction=hostile,
+			main=demon,
+			echelon=squad] (6,4)
 	\end{tikzpicture}
 \end{frame}