Skip to content

Commit

Permalink
Merge pull request #252 from felikatze/wrens-wip-branch
Browse files Browse the repository at this point in the history 
added armory
  • Loading branch information
@felikatze
felikatze authored Jan 18, 2025
2 parents b0c53ad + 4ff70f3 commit 53dd0e9
Show file tree
Hide file tree
Showing 13 changed files with 2,838 additions and 1,998 deletions.
125 changes: 61 additions & 64 deletions public/events/colortheory.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1>Color Theory</h1>
<p>This page contains text compiled from:</p>

<ul>
<li><a href="/rooms/loop/ihadaquestion.html">Loop Quest Help</a></li>
<li><a href="/rooms/loop/ihadaquestion.html">Loop Quest Help (I had a question...)</a></li>
<li><a href="/rooms/floor2/secret_library.html">Secret Library</a></li>
<li><a href="/rooms/floor3/observatory.html">Observatory</a></li>
</ul>
Expand Down Expand Up @@ -114,7 +114,7 @@ <h1 id="loop1">Loop Talk 1</h1>

<h1 id="library">Secret Library</h1>
<p><b>Full page:</b> <a href="/rooms/floor2/secret_library.html">Secret Library</a></p>
<p>The book on the left bookshelf.</p>
<p>The book on the left bookshelf. Can only be read in ACT 3 onwards.</p>

<br>

Expand All @@ -124,14 +124,12 @@ <h1 id="library">Secret Library</h1>
(The bookcase is filled with books about something called "Colors".)
</p>

<br>
<hr>

<ul>
<li><b>ACT 2:</b> (None of those catch your eye.)</li>
<li><b>After starting <a href="/acts/act3-4/odilequest.html">Odile's Friendquest</a>:</b> (No familytales, but...)</li>
</ul>
<p class="dialogue-note">While looking for <a href="/acts/act3-4/odilequest.html">a familytale</a></p>
<p class="dialogue-line indented">(No familytales, but...)</p>

<br>
<hr>

<p class="dialogue-line">
(You need any help you can get.)
Expand Down Expand Up @@ -286,7 +284,7 @@ <h1 id="library">Secret Library</h1>
</span>
THAT'S SUCH BIG NEWS?!?! HOW DID I NOT KNOW THIS?!??!
</p>

<p class="dialogue-line">
<span class="dialogue-head">
<span class="dialogue-name">Isabeau</span>
Expand Down Expand Up @@ -315,13 +313,13 @@ <h1 id="library">Secret Library</h1>

<hr>

<h4>First time only</h4>
<p class="dialogue-note">First time</p>

<p class="dialogue-line">
<p class="dialogue-line indented">
("Colors"... Shades people can't see anymore...)
</p>

<p class="dialogue-line">
<p class="dialogue-line indented">
(It seems silly, but somehow, this knowledge feels familiar to you.)
</p>

Expand Down Expand Up @@ -406,7 +404,11 @@ <h1 id="loop2">Loop Talk 2</h1>

<h1 id="observatory">Observatory</h1>
<p><b>Full page:</b> <a href="/rooms/floor3/observatory.html">Observatory</a></p>
<p>The open book on the central table.</p>
<p>
The open book on the central table.
This version of the dialogue only plays if you've seen a color before and read the other book in the same loop.
For other variations, see the full page.
</p>

<br>

Expand Down Expand Up @@ -453,34 +455,24 @@ <h1 id="observatory">Observatory</h1>
</span>
"Color theory"...
</p>

<h4>If you've never read the first color book before</h4>

<p class="dialogue-line">
(...)
</p>

<p class="dialogue-line">
(Colors... What you saw, when you talked to the King...)
</p>


<p class="dialogue-line">
(Was that a "color"?)
<span class="dialogue-head">
<span class="dialogue-name">Isabeau</span>
<span class="dialogue-expression">(hahaha1)</span>
</span>
Let's rea--
</p>

<p class="dialogue-line">
(...)
<span class="dialogue-head">
<span class="dialogue-name">Odile</span>
<span class="dialogue-expression">(urgh1)</span>
</span>
WE DON'T HAVE TIME FOR THIS.
</p>

<ul>
<li><b>If you've never read the first color book:</b>
(What's a color? Maybe you should look around the House for another book on colors...)</li>
<li><b>If you have read it, but not this loop:</b>(Maybe you should reread the color book in the secret library first...)</li>
</ul>

<hr>

<h4>If you've read the first color book in this loop</h4>
<br>

<p class="dialogue-line">
(But what if you did.)
Expand Down Expand Up @@ -594,61 +586,65 @@ <h4>If you've read the first color book in this loop</h4>

<hr>

<h4>If the party doesn't know about Wish Craft</h4>
<p class="dialogue-note">If the party doesn't know about Wish Craft</p>

<p class="dialogue-line">
<p class="dialogue-line indented">
<span class="dialogue-head">
<span class="dialogue-name">Bonnie</span>
<span class="dialogue-expression">(ew1)</span>
</span>
Weird...
</p>

<hr>
<br>

<h4>If you've read the <a href="/rooms/floor1/stostorageroomoom.html#wish">first book on Wish Craft</a> this loop</h4>
<p class="dialogue-note">If you've read the <a href="/rooms/floor1/stostorageroomoom.html#wish">first book on Wish Craft</a> this loop</p>

<p class="dialogue-line">
<span class="dialogue-head">
<span class="dialogue-name">Mirabelle</span>
<span class="dialogue-expression">(hm3)</span>
</span>
...That Wish Craft thing, perhaps?"
</p>
<div class="indented">

<p class="dialogue-line">
<span class="dialogue-head">
<span class="dialogue-name">Mirabelle</span>
<span class="dialogue-expression">(hm3)</span>
</span>
...That Wish Craft thing, perhaps?"
</p>

<br>
<br>

<p class="dialogue-line">
(Oh.)
</p>
<p class="dialogue-line">
(Oh.)
</p>

<br>
<br>

<p class="dialogue-line">
<span class="dialogue-head">
<span class="dialogue-name">Odile</span>
<span class="dialogue-expression">(huh1)</span>
</span>
Ah yes... If Wish Craft can really make the impossible come true, maybe that is what happened.
</p>
<p class="dialogue-line">
<span class="dialogue-head">
<span class="dialogue-name">Odile</span>
<span class="dialogue-expression">(huh1)</span>
</span>
Ah yes... If Wish Craft can really make the impossible come true, maybe that is what happened.
</p>

</div>

<hr>

<h4>First time</h4>
<p class="dialogue-note">First time</p>

<p class="dialogue-line">
<p class="dialogue-line indented">
(You're still wondering about that weird shade you saw, while... Talking to the King.)
</p>

<p class="dialogue-line">
<p class="dialogue-line indented">
(Was that weird shade a "color"?)
</p>

<hr>
<br>

<h4>Subsequent times</h4>
<p class="dialogue-note">Subsequent times</p>

<p class="dialogue-line">
<p class="dialogue-line indented">
(Ask again.)
</p>

Expand Down Expand Up @@ -781,6 +777,7 @@ <h4>Subsequent times</h4>
</p>

</div>

<hr>
<br>

Expand Down
14 changes: 13 additions & 1 deletion public/feed.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Su, 05 Jan 2025 23:00:00 +1100
Mo, 13 Jan 2025 21:00:00 +1100
</lastBuildDate>
<ttl>20000</ttl>

<item>
<title>Armory</title>
<description>
All text for the Armory on Floor 1.
</description>
<link>https://felicitations.neocities.org/rooms/floor1/armory.html</link>
<guid>https://felicitations.neocities.org/xml/item0098</guid>
<pubDate>
Mo, 13 Jan 2025 21:00:00 +1100
</pubDate>
</item>

<item>
<title>Floor 2 Break Room</title>
<description>
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
View file
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/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>
<li><a href="/random/memories.html">Memories compliation</a></li>
Expand All @@ -93,7 +94,6 @@ <h2>New Events</h2>
<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>
<li><a href="/acts/act6/act6npcs.html">ACT 6 NPCs</a></li>
</ol>

<hr>
Expand Down
3 changes: 2 additions & 1 deletion public/overview/rooms.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ <h1 id="f1">Floor 1</h1>

<ul>
<li><a href="/rooms/floor3/centralrooms.html#f1">Central Room</a></li>
<li><a href="/rooms/floor1/armory.html">Armory</a></li>
<li><a href="/rooms/floor1/breakroom1.html">Break Room</a></li>
<li><a href="/rooms/floor1/candleroom.html">Candle Room</a></li>
<li><a href="/rooms/floor1/snackbreak1.html">First Snack Break</a></li>
Expand Down Expand Up @@ -157,7 +158,7 @@ <h1 id="f3">Floor 3</h1>

<ul>
<li><a href="/rooms/floor3/centralrooms.html#f3">Central Room</a></li>
<li><a href="/rooms/floor3/bathroom_monologues.html">Bathroom Monologues</a></li>
<li><a href="/rooms/floor3/bathroom_monologues.html">Bathroom</a> (including Monologues)</li>
<li><a href="/rooms/floor3/breakroom3.html">Break Room</a> (with the dog)</li>
<li><a href="/rooms/floor3/changeroom.html">Change Room</a></li>
<li><a href="/rooms/floor3/miradorm.html">Mirabelle's Dorm Room</a></li>
Expand Down
2 changes: 1 addition & 1 deletion public/random/equipment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ <h3>Description</h3>
<br>

<h3>Obtaining</h3>
<p><b>Location: </b> Floor 1, Armory (Page WIP), on the wall.</p>
<p><b>Location: </b> Floor 1, <a href="/rooms/floor1/armory.html">Armory</a>, on the wall.</p>

<div class="dialogue">

Expand Down
Loading

0 comments on commit 53dd0e9

Please sign in to comment.