Merge pull request #236 from felikatze/wrens-wip-branch

added infirmary
felikatze · Dec 11, 2024 · 0268e75 · 0268e75
2 parents e06354f + 69a05d1
commit 0268e75
Show file tree

Hide file tree

Showing 13 changed files with 755 additions and 48 deletions.
diff --git a/public/acts/act6/act6npcs.html b/public/acts/act6/act6npcs.html
@@ -402,7 +402,7 @@ <h2 id="bandages">Short-Haired Housemaiden and Long-Haired Housemaiden</h2>
 <br>
 
 <h2 id="infirmary">Sleepy Person</h2>
-<p>They are originally found in the infirmary (page WIP).</p>
+<p>They are originally found in the <a href="/rooms/floor2/infirmary.html#frozen">Infirmary</a>.</p>
 
 <div class="dialogue">
 

diff --git a/public/feed.xml b/public/feed.xml
@@ -5,10 +5,22 @@
   <description>Keep up to date with the In Stars And Time Script Project!</description>
   <link>https://felicitations.neocities.org/</link>
   <lastBuildDate>
-    Fr, 06 Dec 2024 18:30:00 +1100
+    Mo, 09 Dec 2024 22:43:00 +1030
   </lastBuildDate>
   <ttl>20000</ttl>
 
+<item>
+  <title>Infirmary</title>
+  <description>
+    All text for the Infirmary on Floor 2.
+  </description>
+  <link>https://felicitations.neocities.org/rooms/floor2/infirmary.html</link>
+  <guid>https://felicitations.neocities.org/xml/item0092</guid>
+  <pubDate>
+    Mo, 09 Dec 2024 22:43:00 +1030
+  </pubDate>
+</item>
+
 <item>
   <title>Bathroom (START AGAIN)</title>
   <description>
@@ -50,7 +62,7 @@
   <description>
     All text for talking to Odile in the last room in ACT 6.
   </description>
-  <link>https://felicitations.neocities.org/acts/act6/odileeend6.html</link>
+  <link>https://felicitations.neocities.org/acts/act6/odileend6.html</link>
   <guid>https://felicitations.neocities.org/xml/item0088</guid>
   <pubDate>
     Su, 24 Nov 2024 23:13:00 +0100

diff --git a/public/index.html b/public/index.html
@@ -80,6 +80,7 @@ <h3>Shaking and waving text</h3>
 <h2>New Events</h2>
 <p>Recently finished stuff!</p>
 <ol>
+    <li><a href="/rooms/floor2/infirmary.html">Infirmary</a></li>
     <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>
@@ -89,7 +90,6 @@ <h2>New Events</h2>
     <li><a href="/acts/act6/bonnieend6.html">Bonnie End Talk (ACT 6)</a></li>
     <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>
 </ol>
 
 <hr>

diff --git a/public/overview/rooms.html b/public/overview/rooms.html
@@ -127,6 +127,7 @@ <h1 id="f2">Floor 2</h1>
     <li><a href="/rooms/floor2/garden.html">Gardening Room</a></li>
     <li><a href="/rooms/floor2/admin.html">Head Housemaiden's Office</a></li>
     <li><a href="/rooms/floor2/houselibrary.html">House Library</a></li>
+    <li><a href="/rooms/floor2/infirmary.html">Infirmary</a></li>
     <li><a href="/rooms/floor2/snackbreak2.html">Second Snack Break</a></li>
     <li><a href="/rooms/floor2/secret_library.html">Secret Library</a></li>
     <li><a href="/rooms/floor2/traproom.html">Trap Building Room</a></li>

diff --git a/public/random/change_god_statues.html b/public/random/change_god_statues.html
@@ -3,7 +3,7 @@
   <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>In Stars and Time Script Project</title>
+  <title>Generic Change God Statues</title>
 
   <link href="/styletest.css" rel="stylesheet" type="text/css" media="all">
 

diff --git a/public/random/deaths.html b/public/random/deaths.html
@@ -2540,7 +2540,7 @@ <h1>Starting a battle</h1>
             <h1 id="tears">Tears</h1>
 
                 <p>Being frozen by a tear.</p>
-                <p>For the first tear death in ACT 2, see... WIP.</p>
+                <p>For the first tear death in ACT 2, see <a href="/rooms/floor1/hallways1.html#tutotears">Floor 1 Hallways</a>.</p>
                 <p>For the dying part, see <a href="/random/generic.html#tears">Generic Dialogues</a>.</p>
 
                 <br>

diff --git a/public/random/souvenirs1.html b/public/random/souvenirs1.html
@@ -627,7 +627,7 @@ <h2>Description</h2>
 <br>
 
 <h2>Obtaining</h2>
-<p>Main Page: Infirmary (WIP)</p>
+<p>Main Page: <a href="/rooms/floor2/infirmary.html">Infirmary</a></p>
 <p>Location: In the closet.</p>
 
 <div class="dialogue">
@@ -677,23 +677,6 @@ <h2>Obtaining</h2>
     <p class="dialogue-line indented">(You got the broken doll again.)</p>
     <p class="dialogue-line indented">(This doll will never see the end.)</p>
 
-    <!-- wrote this bit then realised i didn't need it, but we don't have a page for the infirmary yet so i'm leaving it
-    <hr>
-
-    <h4>ACT 5</h4>
-    
-    <p class="dialogue-line">(A closet. There's a porcelain doll in it.)</p>
-    <p class="dialogue-line">(It's cracked, with half its face missing. Someone probably threw it away.)</p>
-    <br>
-    <p class="dialogue-line">(Got the BROKEN DOLL.)</p>
-    <p class="dialogue-line">(You put the doll in your pocket along with your Souvenirs.)</p>
-
-    <br>
-
-    <p class="dialogue-note">Repeated interaction</p>
-    <p class="dialogue-line indented">(You'll see the end this time, broken doll!)</p>
-    <p class="dialogue-line indented"><span class="shake">(Even if it's the last thing you do!!!)</span></p>-->
-
 </div>
 
 <br>

diff --git a/public/rooms/dormont/meadow.html b/public/rooms/dormont/meadow.html
@@ -256,7 +256,7 @@ <h4>If you've beaten the game before</h4>
 
                         <p class="dialogue-line">
                             <span class="dialogue-name">Mirabelle</span>:
-                            "Siffrin!"
+                            <span class="wave">"Siffrin!"</span>
                         </p>
 
                         <br>
@@ -467,7 +467,7 @@ <h1 id="act2">ACT 2 Intro</h1>
                             <span class="dialogue-head">
                                 <span class="dialogue-name">Mirabelle</span>
                             </span>
-                            Siffrin!
+                            <span class="wave">Siffrin!</span>
                         </p>
 
                         <p class="dialogue-line">
@@ -625,7 +625,7 @@ <h1 id="act2">ACT 2 Intro</h1>
                         </p>
 
                         <p class="dialogue-line">
-                            (Pheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeew.)
+                            <span class="wave">(Pheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeew.)</span>
                         </p>
 
                         <p class="dialogue-line">
@@ -767,7 +767,7 @@ <h1 id="act3">ACT 3 Intro</h1>
                             <span class="dialogue-head">
                                 <span class="dialogue-name">Mirabelle</span>
                             </span>
-                            Siffrin!
+                            <span class="wave">Siffrin!</span>
                         </p>
 
                         <br>
@@ -880,15 +880,7 @@ <h1 id="act3">ACT 3 Intro</h1>
                                 <span class="dialogue-name">Siffrin</span>
                                 <span class="dialogue-expression">(what2)</span>
                             </span>
-                            (AH!)
-                        </p>
-
-                        <p class="dialogue-line">
-                            <span class="dialogue-head">
-                                <span class="dialogue-name">Siffrin</span>
-                                <span class="dialogue-expression">(what2)</span>
-                            </span>
-                            "Mira..."
+                            (AH!) "Mira..."
                         </p>
 
                         <p class="dialogue-line">
@@ -1173,15 +1165,15 @@ <h1 id="act3">ACT 3 Intro</h1>
 
                 <h1 id="act34">ACT 3-4</h1>
                     <p>
-                        ACT 4 can start with two different events. The first is the end of <a href="/acts/act3-4/kingquest.html">Kingquest</a>. The other is the end of <a href="/acts/act3-4/friendquest.html">Friendquest</a>. (WIP note: that is not a page yet.)
+                        ACT 4 can start with two different events. The first is the end of <a href="/acts/act3-4/kingquest.html">Kingquest</a>. The other is getting to the end with all <a href="/rooms/end/euphrasie.html#fq">Friendquests</a>.
                     </p>
                     <p>
-                        Both need to be completed to enter ACT 4, it's just that whichever you do last incriments the ACT counter. The scenes for each remain identical whether they are first or second.
+                        Both need to be completed to enter ACT 4, it's just that whichever you do last increments the ACT counter. The scenes for each remain identical whether they are first or second.
                     </p>
 
                     <ul>
-                        <li><a href="kingquest">Kingquest</a></li>
-                        <li><a href="friendquest">Friendquest</a></li>
+                        <li><a href="#kingquest">Kingquest</a></li>
+                        <li><a href="#friendquest">Friendquests</a></li>
                     </ul>
 
                     <br>
@@ -1368,7 +1360,7 @@ <h3 id="kingend">End</h3>
                             </p>
 
                             <p>
-                                This scene can enter the player into ACT 4, if they've already done Friendquest.
+                                This scene can enter the player into ACT 4, if they've already done Friendquests.
                             </p>
 
                         <br>

diff --git a/public/rooms/floor2/hallways2.html b/public/rooms/floor2/hallways2.html
@@ -1479,7 +1479,7 @@ <h2 id="tears">Rows of Tears</h2>
 <p>
     Two hallways right of the center room and locked by the <a href="/rooms/floor2/houselibrary.html#key">Paper Key</a>. 
     Has two sets of tears and a openphrase-&NoBreak;locked door leading to the <a href="/rooms/floor2/breakroom2.html">break room</a>.
-    The path on the bottom leads to the Trap Making Room (WIP), and the path on the top leads to the Infirmary (WIP) and is a dead end.
+    The path on the bottom leads to the <a href="/rooms/floor2/traproom.html">Trap Building Room</a>, and the path on the top leads to the <a href="/rooms/floor2/infirmary.html">Infirmary</a> and is a dead end.
 </p>
 
 <h3>Approaching the tears</h3>