Merge pull request #226 from vixspade/main

VS Friends typo fixes + change wave animation from cubic-bezier to linear
felikatze · Dec 8, 2024 · 42bc8ba · 42bc8ba
2 parents 8dfa122 + 1e1649a
commit 42bc8ba
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/public/acts/act5/VSFriends.html b/public/acts/act5/VSFriends.html
@@ -393,7 +393,7 @@ <h1 id="turn1">Turn 1</h1>
                         </p>
                         <br>
                         <p class="dialogue-line">
-                            <span class="shake">(THEY DON'T UNDERSTNAD!!!)</span>
+                            <span class="shake">(THEY DON'T UNDERSTAND!!!)</span>
                         </p>
                         <p class="dialogue-line">
                             <span class="shake">(YOU CANNOT ALLOW THEM TO GO HOME!!!!!!)</span>
@@ -1782,7 +1782,7 @@ <h1 id="wish">Wishes</h1>
                             <span class="dialogue-head">
                                 <span class="dialogue-name">Isabeau</span>
                             </span>
-                            Ha, no, <span class="shake">not the pranks!!!</span>
+                            Ha, no, <span class="wave">not the pranks!!!</span>
                         </p>
                         <br>
                         <img src="https://instarsandtime.wiki.gg/images/f/fa/ISAT_Event_ACT5_Falling_Reso_2.png" alt="image ID: Isabeau looking tenderly at Siffrin, the viewer, as he falls. end ID.">

diff --git a/public/bars.js b/public/bars.js
@@ -336,7 +336,7 @@ function disableShakeAnimation() {
 wrapAllCharacters(document.getElementsByClassName("wave"));
 
 var wavelength = 0.025; // what unit? who knows
-var waveAmplitude = 10;
+var waveAmplitude = 15;
 var waveSpeed = 0.75;
 
 function applyWaveAnimation() {
@@ -348,7 +348,9 @@ function applyWaveAnimation() {
                 children[child].classList.remove("wave-visual");
 
                 children[child].style.display = "inline-block";
-                children[child].style.animation = `${waveSpeed}s wave cubic-bezier(0.37, 0, 0.63, 1) infinite ${-child * wavelength}s alternate`;
+                // if live editing a page to change all cubic-bezier to linear this looks weird but hopefully it works fine
+                // linear is more accurate to the game (with an amplitude of 15-20ish % ?
+                children[child].style.animation = `${waveSpeed}s wave linear infinite ${-child * wavelength}s alternate`;
                 children[child].style.setProperty("--wave-amplitude", `${waveAmplitude}%`);
             }
         }

diff --git a/public/rooms/floor3/bathroom_monologues.html b/public/rooms/floor3/bathroom_monologues.html
@@ -97,9 +97,6 @@ <h2 id="first">First time</h2>
                             <p class="dialogue-line">
                                 (You're all doing it!!! You're all getting so close to the King!!!)
                             </p>
-                            <p class="dialogue-line">
-                                (You're all doing it!!! You're all getting so close to the King!!!)
-                            </p>
                             <p class="dialogue-line">
                                 (And it's all thanks to you and this blessing!!!)
                             </p>
@@ -1262,7 +1259,7 @@ <h3 id="isabeau-odile">Isabeau & Odile</h3>
                                 </p>
                                 <p class="dialogue-line">
                                     <span class="dialogue-head">
-                                        <span class="dialogue-name">Isabeau</span>
+                                        <span class="dialogue-name">Odile</span>
                                     </span>
                                     Urgh. See if I give you more stunning advice next time, Isabeau.
                                 </p>
@@ -1287,7 +1284,7 @@ <h3 id="isabeau-odile">Isabeau & Odile</h3>
                                 </p>
                                 <p class="dialogue-line">
                                     <span class="dialogue-head">
-                                        <span class="dialogue-name">Odile</span>
+                                        <span class="dialogue-name">Isabeau</span>
                                     </span>
                                     I miss drunk Odile... She has the best theories...
                                 </p>