Merge pull request #322 from ceruleanwarbler2/main

various fixes

Author: fairywwrens

public/acts/act3-4/bonniequest.html

@@ -1737,7 +1737,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
     <p class="dialogue-line">
         <span class="dialogue-head">
             <span class="dialogue-name">Bonnie</span>
-            <span class="dialogue-expression">(sulk1)</span>
+            <span class="dialogue-expression">(no!1)</span>
         </span>
         I... &ensp;I need you to teach me how to fight!
     </p>
@@ -1795,6 +1795,14 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
         </span>
         So you're gonna help me!!!
     </p>
+
+    <p class="dialogue-line">
+        <span class="dialogue-head">
+            <span class="dialogue-name">Bonnie</span>
+            <span class="dialogue-expression">(stop!2)</span>
+        </span>
+        Let's go!!!
+    </p>
 
     <br>
 
@@ -1977,7 +1985,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
     <br>
 
     <p class="dialogue-note">
-        Siffrin attacks the Sadness, dealing almost 2000 damage and instantly killing it.
+        Siffrin attacks the Sadness, dealing around 2000 damage and instantly killing it.
     </p>
 
     <br>
@@ -2072,7 +2080,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
 
     <div class="indented">
         <p class="dialogue-line">
-            (You look at bonnie closely...)
+            (You look at Bonnie closely...)
         </p>
 
         <p class="dialogue-line">
@@ -2266,7 +2274,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
 
     <p class="dialogue-note">ACT 4</p>
     <p class="dialogue-line indented">
-        (You stare at them, without saying a word.)
+        (You stare at them, without saying anything.)
     </p>
 
     <br>
@@ -2896,7 +2904,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
             <span class="dialogue-name">Bonnie</span>
             <span class="dialogue-expression">(surprised1)</span>
         </span>
-        Nille's really cool and tough, but she gets scared easily, I think.
+        Nille's really cool and tough, but she gets scared easy, I think.
     </p>
 
     <p class="dialogue-line">
@@ -3577,7 +3585,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
     <p class="dialogue-line">
         <span class="dialogue-head">
             <span class="dialogue-name">Bonnie</span>
-            <span class="dialogue-expression">(serious1)</span>
+            <span class="dialogue-expression">(no!2)</span>
         </span>
         <span class="big"><span class="shake">!!! FRIN!!!</span></span>
     </p>
@@ -3611,7 +3619,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
     <br>
 
     <p class="dialogue-note">
-        (Bonnie attacks the Sadness with a special cut-in illustration, dealing nearly 2000 damage and killing it instantly.)
+        (Bonnie attacks the Sadness with a special cut-in illustration, dealing around 2000 damage and killing it instantly.)
     </p>
 
     <br>
@@ -3753,7 +3761,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
     <p class="dialogue-line">
         <span class="dialogue-head">
             <span class="dialogue-name">Bonnie</span>
-            <span class="dialogue-expression">(no!1)</span>
+            <span class="dialogue-expression">(no!2)</span>
         </span>
         No, no, I didn't mean...
     </p>
@@ -3845,15 +3853,15 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
     <p class="dialogue-line">
         <span class="dialogue-head">
             <span class="dialogue-name">Bonnie</span>
-            <span class="dialogue-expression">(serious1)</span>
+            <span class="dialogue-expression">(surprised1)</span>
         </span>
         Yeah. You remember, right? It was a while back...
     </p>
 
     <p class="dialogue-line">
         <span class="dialogue-head">
             <span class="dialogue-name">Bonnie</span>
-            <span class="dialogue-expression">(serious1)</span>
+            <span class="dialogue-expression">(surprised1)</span>
         </span>
         When you protected me from that other Sadness, you know.
     </p>
@@ -4573,7 +4581,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
                     </p>
 
                     <p class="dialogue-line">
-                        <span class="shake">(BECAUSE YOU TRIED SOMETHING NEW... &ensp;BONNIE...! &ensp;BONNIE...!!!)</span>
+                        <span class="shake">(BECAUSE YOU TRIED SOMETHING NEW... &ensp;BONNIE... &ensp;BONNIE...!!!)</span>
                     </p>
 
                     <br>
@@ -4597,7 +4605,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
                     </p>
 
                     <p class="dialogue-line">
-                        (You try to breathe, slowly, in, and out--)
+                        <span class="shake">(You try to breathe, slowly, in, and out--)</span>
                     </p>
 
                     <br>
@@ -5461,4 +5469,4 @@ <h1 id="skip">Skipped Quest</h1>
     <foot-er></foot-er>
 
 </body>
-</html>
+</html>

public/acts/act3-4/miraquest.html

@@ -144,6 +144,14 @@ <h1 id="mira1">First Talk with Mirabelle</h1>
                     (Where is THIS coming from...) "Of course I'd tell you!"
                 </p>
 
+				<p class="dialogue-line">
+					<span class="dialogue-head">
+						<span class="dialogue-name">Mirabelle</span>
+						<span class="dialogue-expression">(anxious2)</span>
+					</span>
+					Siffrin, I...
+				</p>
+                    
                 <p class="dialogue-line">
                     <span class="dialogue-head">
                         <span class="dialogue-name">Mirabelle</span>
@@ -4549,4 +4557,4 @@ <h1 id="skipped">Skipped Quest</h1>
     </div>
 
 </body>
-</html>
+</html>

public/events/odilesus.html

@@ -27,9 +27,9 @@ <h1>Odile Sus Events</h1>
 				<small>Dialogue compiled by memeseller (tumblr baketothefuture)</small>
 				<p>Acting weird enough for Odile to both notice, and also finally talk about.</p>
 				<p>To unlock, read the Time Craft book in the <a href="/rooms/floor1/candleroom.html">Candle-making room</a> as well as the books on Wish Craft in the <a href="/rooms/floor1/storageroom1.html">locked Storage Room</a> on Floor 1 and the <a href="/rooms/floor2/secret_library.html">Secret Library</a> on Floor 2.</p>
-				<p>Additionally, the player needs to obtain a total of 14 Weird points and talk to Odile during the <a href="/rooms/floor3/snackbreak3.html">third Snack Break</a>.</p>
+				<p>Additionally, the player needs to obtain a total of 15 Weird Points.</p>
 				<p>The additional scene in the third snack break does not occur on a loop with all Friendquests completed. The actual event itself still does, though.</p>
-				<p>For more details on Weird points, check out the respective <a href="https://instarsandtime.wiki.gg/wiki/Suspicious_Event">wiki page</a> on the event</p>
+				<p>For more details on Weird Points, check out the respective <a href="https://instarsandtime.wiki.gg/wiki/Suspicious_Event">wiki page</a> on the event</p>
 				<p><b>Source:</b> Common Event 132 (OdileSidequest)</p>
 
 				<hr>
@@ -162,7 +162,7 @@ <h1 id="snack1">First Snack Break</h1>
 
 				<h1 id="snack2">Second Snack Break</h1>
 				<p><b>Full page:</b> <a href="/rooms/floor2/snackbreak2.html">Second Snack Break</a></p>
-				<p>Talking to Odile after the second snack break with four or more Weird Points gained on Floor 2.</p>
+				<p>Talking to Odile after the second snack break with four or more Weird Points gained on Floor 2. This requirement changes to five or more on a loop with all Friendquests completed.</p>
 
 				<br>
 
@@ -2045,3 +2045,5 @@ <h1 id="loop2">Loop Talk 2</h1>
 
 </body>
 </html>
+
+

public/rooms/dormont/center.html

@@ -2467,7 +2467,7 @@ <h1 id="runner">Running One</h1>
                                         (Oh?)
                                     </p>
 
-                                    <p class="dialogue-note">ACT 4 & 4</p>
+                                    <p class="dialogue-note">ACT 3 & 4</p>
                                     <p class="dialogue-line indented">
                                         <span class="dialogue-head">
                                             <span class="dialogue-name">Siffrin</span>
@@ -3050,4 +3050,4 @@ <h3>ACT 5</h3>
     </div>
 
 </body>
-</html>
+</html>

public/rooms/dormont/miratalk.html

@@ -119,6 +119,7 @@ <h2 id="b3">ACT 3 Intro</h2>
 						</span>
 						Oh! Siffrin...
 					</p>
+					
 					<p class="dialogue-line">
 						<span class="dialogue-head">
 							<span class="dialogue-name">Mirabelle</span>
@@ -143,6 +144,14 @@ <h2 id="b3">ACT 3 Intro</h2>
 						(Where is THIS coming from...) "Of course I'd tell you!"
 					</p>
 
+					<p class="dialogue-line">
+						<span class="dialogue-head">
+							<span class="dialogue-name">Mirabelle</span>
+							<span class="dialogue-expression">(anxious2)</span>
+						</span>
+						Siffrin, I...
+					</p>
+
 					<p class="dialogue-line">
 						<span class="dialogue-head">
 							<span class="dialogue-name">Mirabelle</span>
@@ -2145,4 +2154,4 @@ <h2 id="nope">"Nope!"</h2>
 	</div>
 
 </body>
-</html>
+</html>

public/rooms/floor1/snackbreak1.html

@@ -2042,23 +2042,23 @@ <h4>Without Bonnie's Friendquest</h4>
 									<p class="dialogue-line">
 										<span class="dialogue-head">
 											<span class="dialogue-name">Bonnie</span>
-											<span class="dialogue-expression">(sulk5)</span>
+											<span class="dialogue-expression">(serious1)</span>
 										</span>
 										You're...
 									</p>
 
 									<p class="dialogue-line">
 										<span class="dialogue-head">
 											<span class="dialogue-name">Bonnie</span>
-											<span class="dialogue-expression">(sulk5)</span>
+											<span class="dialogue-expression">(sulk1)</span>
 										</span>
 										. . .
 									</p>
 
 									<p class="dialogue-line">
 										<span class="dialogue-head">
 											<span class="dialogue-name">Bonnie</span>
-											<span class="dialogue-expression">(sulk5)</span>
+											<span class="dialogue-expression">(sad1)</span>
 										</span>
 										I dunno.
 									</p>
@@ -2076,7 +2076,7 @@ <h4>With Bonnie's Friendquest</h4>
 									<p class="dialogue-line">
 										<span class="dialogue-head">
 											<span class="dialogue-name">Bonnie</span>
-											<span class="dialogue-expression">(sulk5)</span>
+											<span class="dialogue-expression">(smile2)</span>
 										</span>
 										You're my cousin who I see once a year and we have a really good time!!!
 									</p>
@@ -2595,7 +2595,7 @@ <h4>If you told the joke right:</h4>
 					<p class="dialogue-line">
 						<span class="dialogue-head">
 							<span class="dialogue-name">Mirabelle</span>
-							<span class="dialogue-expression">(happy4)</span>
+							<span class="dialogue-expression">(happy1)</span>
 						</span>
 						Hehehe...
 					</p>
@@ -3294,4 +3294,4 @@ <h1 id="act5">ACT 5</h1>
 	</div>
 
 </body>
-</html>
+</html>

public/rooms/floor2/snackbreak2.html

@@ -4446,6 +4446,10 @@ <h4>Without her Friendquest done this loop:</h4>
                                                         </span>
                                                         . . .
                                                     </p>
+                                                    
+                                                    <br>
+
+                                                    <p class="dialogue-note">You get a Weird Point for this.</p>
 
                                                 </div>
                                             </details>
@@ -4463,7 +4467,7 @@ <h4>Without her Friendquest done this loop:</h4>
                 <br>
 
                 <h3 id="odilesus">Suspicious variant</h3>
-                <p>Her dialogue changes if you have four Weird Points or more as part of the <a href="/events/odilesus.html">Sus Event</a>. For an in-depth explanation on Weird Points, look at <a href="https://instarsandtime.wiki.gg/wiki/Suspicious_Event"><abbr title="In Stars and Time">ISAT</abbr>wiki</a>. This dialogue change also overrides Friendquest dialogue changes.</p>
+                <p>Her dialogue changes if you obtained four of Floor 2's Weird Points or more as part of the <a href="/events/odilesus.html">Sus Event</a>. This requirement changes to five or more on a loop with all Friendquests completed, and overrides Friendquest's dialogue. For an in-depth explanation on Weird Points, look at <a href="https://instarsandtime.wiki.gg/wiki/Suspicious_Event"><abbr title="In Stars and Time">ISAT</abbr>wiki</a>.</p>
 
                 <br>