Merge pull request #227 from felikatze/feli's-wip-branch-2

sasasap bathroom
felikatze · Dec 8, 2024 · 8dfa122 · 8dfa122
2 parents 5165f49 + e918704
commit 8dfa122
Show file tree

Hide file tree

Showing 9 changed files with 2,725 additions and 416 deletions.
diff --git a/public/acts/act3-4/kingquest.html b/public/acts/act3-4/kingquest.html
@@ -4430,7 +4430,7 @@ <h2 id="kingfinal">The King</h2>
 
 <p><b>Mirabelle (uwah!1):</b> SIFFRIN?!?!</p>
 <p><b>Odile (no!1):</b> What are you--</p>
-<p><b>King:</b> ......</p>
+<p><b>King:</b> <span class="shake">......</span></p>
 
 <br>
 
@@ -4442,12 +4442,12 @@ <h2 id="kingfinal">The King</h2>
 
 <p><b>Siffrin (hide1):</b> "We don't have to fight..."</p>
 <p><b>Siffrin (angry4):</b> "We're looking for the same thing!!!"</p>
-<p><b>King:</b> ......!!!</p>
+<p><b>King:</b> <span class="shake">......!!!</span></p>
 <p><b>Siffrin (yelling3):</b> "I know! I understand why you're doing this!"</p>
 <p><b>Siffrin (yelling2):</b> "But this isn't the way to do it!"</p>
 <p><b>Siffrin (upset1):</b> "We can protect this country another way! You don't need to freeze it forever!"</p>
 <p><b>Siffrin (yelling1):</b> "Do you really want it all to end?"</p>
-<p><b>King:</b> ...... </p>
+<p><b>King:</b> <span class="shake">......</span></p>
 <p><b>Siffrin (yelling3):</b> "Let's just stop fighting! Leave this country be!"</p>
 <p><b>Siffrin (yelling1):</b> "We don't need to keep holding onto it..."</p>
 <p><b>Siffrin (upset1):</b> "Let's just... Let it go..."</p>
@@ -4456,15 +4456,15 @@ <h2 id="kingfinal">The King</h2>
 <p><b>Odile (fight1):</b> ...</p>
 <p><b>Mirabelle (anxious3):</b> ...</p>
 <p><b>Bonnie (wait1):</b> ...</p>
-<p><b>King:</b> ......</p>
-<p><b>King:</b> ......</p>
-<p><b>King:</b> ......I......</p>
-<p><b>King:</b> ......</p>
-<p><b>King:</b> ......Perhaps you are right, bright one.</p>
+<p><b>King:</b> <span class="shake">. . . . . .</span></p>
+<p><b>King:</b> <span class="shake">. . . . . .</span></p>
+<p><b>King:</b> <span class="shake">......&nbsp;&nbsp;&nbsp;&nbsp; I......</span></p>
+<p><b>King:</b> <span class="shake">......</span></p>
+<p><b>King:</b> <span class="shake">......&nbsp;&nbsp;&nbsp;&nbsp; Perhaps you are right, bright one.</span></p>
 <p><b>Isabeau (huhwah1):</b> HUH?!???</p>
 <p><b>Mirabelle (awawa1):</b> WHAT?!?</p>
-<p><b>King:</b> Let us stop this battle.</p>
-<p><b>King:</b> Let us talk to one another...... As people from the same country......</p>
+<p><b>King:</b> <span class="shake">Let us stop this battle.</span></p>
+<p><b>King:</b> <span class="shake">Let us talk to one another......<br> As people from the same country......</span></p>
 
 <br>
 

diff --git a/public/bars.js b/public/bars.js
@@ -75,7 +75,7 @@ class Footer extends HTMLElement {
     }
 
     connectedCallback() {
-        this.innerHTML = `<footer id="footer">The script is free to use even without attribution to me. <b>In Stars and Time</b> belongs to insertdisc5.</footer>`;
+        this.innerHTML = `<footer id="footer">The script is free to use even without attribution. <b>In Stars and Time</b> belongs to insertdisc5.</footer>`;
     }
 }
 

diff --git a/public/feed.xml b/public/feed.xml
@@ -9,6 +9,18 @@
   </lastBuildDate>
   <ttl>20000</ttl>
 
+<item>
+  <title>Bathroom (START AGAIN)</title>
+  <description>
+    All text for START AGAIN's bathroom and associated monologues.
+  </description>
+  <link>https://felicitations.neocities.org/sasasap/bathroomsap.html</link>
+  <guid>https://felicitations.neocities.org/xml/item0091</guid>
+  <pubDate>
+    Su, 08 Dec 2024 17:03:00 +0100
+  </pubDate>
+</item>
+
 <item>
   <title>ACT 6 NPCs</title>
   <description>

diff --git a/public/index.html b/public/index.html
@@ -42,6 +42,7 @@ <h3>Settings Buttons</h3>
 <ul>
     <li><b>Settings:</b> Open the remaining settings.</li>
     <li><b>Go to top:</b> Go back to the top of the page.</li>
+    <li><b>Change wish style:</b> Toggle between wish text for visibility or wish text with higher game accuracy.</li>
     <li><b>Toggle animations:</b> Turn shaking/waving text off and on. Turning it off sets it to italics.</li>
     <li><b>Toggle expressions:</b> Turn expressions (the little things in parantheses) on/off.</li>
     <li><b>Toggle choices:</b> Open/close all dialogue choices!</li>
@@ -61,6 +62,13 @@ <h3>Expressions</h3>
 
 <h2>Site News</h2>
 
+<h3>Minor changes</h3>
+<p><b>Date:</b> 8th of December, 2024</p>
+<p>You can now toggle between the wish text style decided on by popular vote, and wish text in a style more accurate to the game with the new "Change wish style" button in the settings!</p>
+<p>Settings buttons are now also on the left, for more effective screen space usage on desktop.</p>
+
+<br>
+
 <h3>Shaking and waving text</h3>
 <p>As of... somewhen in October 2024, the site now supports actual animations for shaking / waving text! The animations are only <i>approximate</i> to the actual game, and can be turned off with a settings button. When turned off, they display as italics.</p>
 <p>Once again, shoutout to Gold for doing this!</p>
@@ -72,6 +80,7 @@ <h3>Shaking and waving text</h3>
 <h2>New Events</h2>
 <p>Recently finished stuff!</p>
 <ol>
+    <li><a href="/sasasap/bathroomsap.html">Bathroom</a> (START AGAIN)</li>
     <li><a href="/acts/act6/act6npcs.html">ACT 6 NPCs</a></li>
     <li><a href="/rooms/floor3/potteryroom.html">Pottery Room</a></li>
     <li><a href="/acts/act6/odileend6.html">Odile End Talk (ACT 6)</a></li>
@@ -81,7 +90,6 @@ <h2>New Events</h2>
     <li><a href="/rooms/floor1/writingdorm.html">Writing Dorm</a></li>
     <li><a href="/rooms/floor2/traproom.html">Trap Building Room</a></li>
     <li><a href="/rooms/floor1/kitchen.html">Kitchen</a></li>
-    <li><a href="/rooms/entrance/storageroom0.html">Entrance Storage Room</a></li>
 </ol>
 
 <hr>
@@ -95,7 +103,6 @@ <h2>Requests</h2>
 <ol>
     <li>ACT 6 Last Room dialogue</li>
     <li>Last Room dialogue</li>
-    <li>Bathroom (START AGAIN)</li>
 </ol>
 
 <br>

diff --git a/public/overview/sasasap.html b/public/overview/sasasap.html
@@ -42,6 +42,7 @@ <h1>Story scenes</h1>
 <h1>Rooms</h1>
 
 <ul>
+    <li><a href="/sasasap/bathroomsap.html">Bathroom</a></li>
     <li><a href="/sasasap/hallwayssap.html">Hallways</a></li>
     <li><a href="/sasasap/writingroomsap.html">Writing Room</a></li>
     <li><a href="/sasasap/lastroom.html">Last Room / Snack Room</a></li>

diff --git a/public/rooms/floor1/midboss1.html b/public/rooms/floor1/midboss1.html
diff --git a/public/rooms/floor2/admin.html b/public/rooms/floor2/admin.html
@@ -1439,17 +1439,6 @@ <h2 id="books">Bookcase</h2>
 
 <br>
 
-<h3>Repeated interaction</h3>
-
-<div class="dialogue">
-
-    <p class="dialogue-line">(Some notes about the King.)</p>
-    <p class="dialogue-line">(The Head Housemaiden must've been looking for more information about him...)</p>
-
-</div>
-
-<br>
-
 <h3>ACT 5</h3>
 
 <div class="dialogue">
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ class Footer extends HTMLElement { @@
         }
         connectedCallback() {
-            this.innerHTML = `<footer id="footer">The script is free to use even without attribution to me. <b>In Stars and Time</b> belongs to insertdisc5.</footer>`;
+            this.innerHTML = `<footer id="footer">The script is free to use even without attribution. <b>In Stars and Time</b> belongs to insertdisc5.</footer>`;
         }
     }
@@ Expand Down @@