Skip to content

Commit

Permalink
Merge pull request #257 from felikatze/feli's-wip-branch-2
Browse files Browse the repository at this point in the history
Mira end talk done!
  • Loading branch information
felikatze authored Jan 20, 2025
2 parents 53dd0e9 + c2c3cf5 commit 526512b
Show file tree
Hide file tree
Showing 11 changed files with 6,474 additions and 5,378 deletions.
10,509 changes: 5,257 additions & 5,252 deletions public/acts/act3-4/bonniequest.html

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions public/feed.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@
</lastBuildDate>
<ttl>20000</ttl>

<item>
<title>Mirabelle End Talk</title>
<description>
All text for talking to Mirabelle in the last room.
</description>
<link>https://felicitations.neocities.org/rooms/end/miraend.html</link>
<guid>https://felicitations.neocities.org/xml/item0099</guid>
<pubDate>
Mo, 20 Jan 2025 14:36:00 +0100
</pubDate>
</item>

<item>
<title>Armory</title>
<description>
Expand Down
3 changes: 1 addition & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ <h3>Shaking and waving text</h3>
<h2>New Events</h2>
<p>Recently finished stuff!</p>
<ol>
<li><a href="/rooms/end/miraend.html">Mirabelle End Talk</a></li>
<li><a href="/rooms/floor1/armory.html">Armory</a></li>
<li><a href="/rooms/floor2/breakroom2.html">Floor 2 Break Room</a></li>
<li><a href="/rooms/floor1/breakroom1.html">Floor 1 Break Room</a></li>
Expand All @@ -93,7 +94,6 @@ <h2>New Events</h2>
<li><a href="/rooms/dormont/castlehouse.html">Castle-Loving One's House</a></li>
<li><a href="/rooms/end/bonnieend.html">Bonnie End Talk</a></li>
<li><a href="/rooms/floor2/infirmary.html">Infirmary</a></li>
<li><a href="/sasasap/bathroomsap.html">Bathroom</a> (START AGAIN)</li>
</ol>

<hr>
Expand All @@ -106,7 +106,6 @@ <h2>Requests</h2>

<ol>
<li>ACT 6 Last Room dialogue</li>
<li>Last Room dialogue</li>
</ol>

<br>
Expand Down
1 change: 1 addition & 0 deletions public/overview/rooms.html
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ <h1 id="end">The End</h1>
<li><a href="/rooms/end/bonnieend.html">Bonnie</a></li>
<li><a href="/rooms/end/euphrasie.html">Euphrasie</a> (includes ACT 4 ending)</li>
<li><a href="/rooms/end/isaend.html">Isabeau</a></li>
<li><a href="/rooms/end/miraend.html">Mirabelle</a></li>
<li><a href="/rooms/end/odileend.html">Odile</a></li>
</ul>
</li>
Expand Down
6 changes: 3 additions & 3 deletions public/rooms/end/bonnieend.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ <h1 id="normal">Regular variant</h1>

<br>

<p class="dialogue-note">Fifth time onwards</p>
<p class="dialogue-note">Sixth time onwards</p>
<p class="dialogue-line indented">(.&nbsp;.&nbsp;.)</p>

<br>
Expand All @@ -90,7 +90,7 @@ <h1 id="normal">Regular variant</h1>

<br>

<p class="dialogue-note">Fifth time onwards</p>
<p class="dialogue-note">Sixth time onwards</p>
<p class="dialogue-line indented">("...It's...")</p>

<br>
Expand All @@ -117,7 +117,7 @@ <h1 id="normal">Regular variant</h1>

<br>

<p class="dialogue-note">Fifth time onwards</p>
<p class="dialogue-note">Sixth time onwards</p>
<p class="dialogue-line indented">("Like...")</p>
<br>
<p class="dialogue-line indented">
Expand Down
Loading

0 comments on commit 526512b

Please sign in to comment.