Skip to content

Commit

Permalink
Merge pull request #220 from felikatze/feli's-wip-branch-2
Browse files Browse the repository at this point in the history
finished odile end talk 6
  • Loading branch information
felikatze authored Nov 24, 2024
2 parents 6cae913 + 52cfc51 commit c33408c
Show file tree
Hide file tree
Showing 12 changed files with 7,569 additions and 506 deletions.
34 changes: 10 additions & 24 deletions public/acts/act3-4/bonniequest.html
Original file line number Diff line number Diff line change
Expand Up @@ -1013,10 +1013,10 @@ <h1 id="bonnie2">Second Talk with Bonnie</h1>
<span class="dialogue-name">Siffrin</span>
<span class="dialogue-expression">(sadsmile1)</span>
</span>
(...)
</p>

<ul class="dialogue-option">
<li class="option">(...) "You don't?"</li>
</ul>

<br>
Expand Down Expand Up @@ -3030,10 +3030,11 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
<span class="dialogue-name">Siffrin</span>
<span class="dialogue-expression">(tired1)</span>
</span>
(...)
</p>

<ul class="dialogue-option">
<li class="option">(...) "You don't often talk about her."</li>
<li class="option">"You don't often talk about her."</li>
</ul>

<br>
Expand Down Expand Up @@ -3316,7 +3317,6 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
<p class="dialogue-line indented">
<span class="dialogue-head">
<span class="dialogue-name">Siffrin</span>
<span class="dialogue-expression">(yelling2)</span>
</span>
(OW?!??!?)
</p>
Expand All @@ -3325,7 +3325,6 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
<p class="dialogue-line indented">
<span class="dialogue-head">
<span class="dialogue-name">Siffrin</span>
<span class="dialogue-expression">(yelling1)</span>
</span>
(You jump, more because of pain than surprise.)
</p>
Expand All @@ -3334,7 +3333,6 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
<p class="dialogue-line indented">
<span class="dialogue-head">
<span class="dialogue-name">Siffrin</span>
<span class="dialogue-expression">(yelling2)</span>
</span>
(You barely react.)
</p>
Expand Down Expand Up @@ -3708,7 +3706,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">(serious1)</span> <!-- WIP NOTE: pretty sure this is wrong but i can't check rn -gold -->
</span>
I... &ensp;You haven't called me Bonbon in forever... Only Za calls me that now...
</p>
Expand Down Expand Up @@ -3939,18 +3937,6 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
(...)
</p>

<ul>
<li>
<b>First time:</b>
(Oh!!!)
</li>

<li>
<b>Subsequent times:</b>
(...)
</li>
</ul>

<br>

<p class="dialogue-note">
Expand Down Expand Up @@ -4540,7 +4526,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
<div class="dialogue">

<p class="dialogue-line">
(Not happening. Bonnie.)
(Not happening, Bonnie.)
</p>

</div>
Expand Down Expand Up @@ -4592,7 +4578,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
</p>

<p class="dialogue-line">
(. . . ?)
(. . . ?) <!-- WIP NOTE: this should be bonnie dialogue but i can't grab the portrait rn -gold -->
</p>

<p class="dialogue-line">
Expand Down Expand Up @@ -4964,7 +4950,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>
Y-You see me, right? I'm gonna touch you now!!!
</p>

<img src="https://instarsandtime.wiki.gg/images/0/09/ISAT_Event_ACT3_Friendquest_Bonnie_1.png" alt="Image ID: Bonnie hugs Siffrin, who leans back, surprised. End ID.">
<img src="https://instarsandtime.wiki.gg/images/0/09/ISAT_Event_ACT3_Friendquest_Bonnie_1.png" alt="Image ID: Bonnie hugs Siffrin, who leans back, surprised. End ID." class="cg">

<p class="dialogue-line">
(Bonnie runs into your side.)
Expand All @@ -4989,7 +4975,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>

<br>

<img src="https://instarsandtime.wiki.gg/images/0/00/ISAT_Event_ACT3_Friendquest_Bonnie_2a.png" alt="Image ID: Siffrin awkwardly hugs Bonnie back. End ID.">
<img src="https://instarsandtime.wiki.gg/images/0/00/ISAT_Event_ACT3_Friendquest_Bonnie_2a.png" alt="Image ID: Siffrin awkwardly hugs Bonnie back. End ID." class="cg">

<p class="dialogue-line">
(Slowly, you hug them back.)
Expand All @@ -5005,7 +4991,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>

<div class="dialogue">

<img src="https://instarsandtime.wiki.gg/images/d/d7/ISAT_Event_ACT3_Friendquest_Bonnie_2b.png" alt="Image ID: Siffrin hugs Bonnie back. He looks tired. End ID.">
<img src="https://instarsandtime.wiki.gg/images/d/d7/ISAT_Event_ACT3_Friendquest_Bonnie_2b.png" alt="Image ID: Siffrin hugs Bonnie back. He looks tired. End ID." class="cg">


<p class="dialogue-note">ACT 3</p>
Expand Down Expand Up @@ -5044,7 +5030,7 @@ <h1 id="main">Hanging out with Bonnie (Main Scene)</h1>

<br>

<img src="https://instarsandtime.wiki.gg/images/d/d2/ISAT_Event_ACT3_Friendquest_Bonnie_3.png" alt="Image ID: Bonnie looks up at Siffrin with a goofy, contented grin. End ID.">
<img src="https://instarsandtime.wiki.gg/images/d/d2/ISAT_Event_ACT3_Friendquest_Bonnie_3.png" alt="Image ID: Bonnie looks up at Siffrin with a goofy, contented grin. End ID." class="cg">

<p class="dialogue-line">
<span class="dialogue-head">
Expand Down
Loading

0 comments on commit c33408c

Please sign in to comment.