Merge branch 'main' of https://github.com/felikatze/isat-script-project…

… into golds-wip-branch
felikatze · Dec 19, 2024 · 4223a26 · 4223a26
2 parents c1e0d8f + 1c5ab5f
commit 4223a26
Show file tree

Hide file tree

Showing 61 changed files with 26,460 additions and 14,452 deletions.
diff --git a/public/acts/act3-4/kingquest.html b/public/acts/act3-4/kingquest.html
diff --git a/public/acts/act3-4/loopquest.html b/public/acts/act3-4/loopquest.html
@@ -5700,7 +5700,7 @@ <h4>Subsequent times</h4>
 							<span class="dialogue-name">Mirabelle</span>
 							<span class="dialogue-expression">(excited1)</span>
 						</span>
-						Or sare a medal!
+						Or share a medal!
 					</p>
 
 					<p class="dialogue-line">

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/acts/act5/act5.html b/public/acts/act5/act5.html
@@ -22,16 +22,17 @@
 <p>Tryna lay out all the act 5 stuff brb</p>
 
 <ul>
-    <li>Waking up</li>
-    <li>Friend talks
+    <li><a href="#wakingup">Waking up</a></li>
+    <li><a href="#friendtalks">Friend talks</a>
         <ul>
-            <li>Mirabelle</li>
-            <li>Odile</li>
-            <li>Bonnie</li>
-            <li>Isabeau</li>
-            <li>Loop</li>
+            <li><a href="#miratalk">Mirabelle</a></li>
+            <li><a href="#odiletalk">"Odile</a></li>
+            <li><a href="#bonnietalk">Bonnie</a></li>
+            <li><a href="#isatalk">Isabeau</a></li>
+            <li><a href="#looptalk">Loop</a></li>
         </ul>
     </li>
+    <li><a href="#clocktower">Clocktower</a></li>
     <li>The House
         <ul>
             <li>Floor 1</li>
@@ -43,7 +44,7 @@
     <li>Mal du Pays</li>
     <li>King Victory</li>
     <li>End Start (last room up to battle start)</li>
-    <li>Vs Friends</li>
+    <li>VS Friends</li>
     <li>Tell us your wish</li>
     <li>Last room starting dialogue</li>
 </ul>
@@ -60,7 +61,7 @@
 <hr>
 <br>
 
-<h1>Waking up</h1>
+<h1 id="wakingup">Waking up</h1>
 <div class="dialogue">
     <p class="dialogue-line">
         (You're back.)
@@ -497,7 +498,7 @@ <h2>Taking a nap</h2>
 <hr>
 <br>
 
-<h1>Friend talks</h1>
+<h1 id="friendtalks">Friend talks</h1>
 
 <h2 id="miratalk">Mirabelle</h2>
 <div class="dialogue">
@@ -5147,4 +5148,4 @@ <h1 id="clocktower">Clocktower</h1>
 
 </body>
 
-</html>
+</html>
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/bars.js b/public/bars.js
@@ -75,7 +75,7 @@ class Footer extends HTMLElement {
     }
 
     connectedCallback() {
-        this.innerHTML = `<footer id="footer">The script is free to use even without attribution to me. <b>In Stars and Time</b> belongs to insertdisc5.</footer>`;
+        this.innerHTML = `<footer id="footer">The script is free to use even without attribution. <b>In Stars and Time</b> belongs to insertdisc5.</footer>`;
     }
 }
 
@@ -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}%`);
             }
         }