From 483d549bb137fc83144e875ca6aad0df640673f9 Mon Sep 17 00:00:00 2001
From: ad044 <antidepressant044@protonmail.com>
Date: Sun, 28 Feb 2021 18:32:11 +0400
Subject: [PATCH] minor fixes

---
 src/App.tsx                                   |  6 ++-
 .../GateScene/GateMiddleObject/BlueDigit.tsx  |  2 +-
 src/components/IdleManager.tsx                | 50 +++++++++----------
 src/components/MainScene/Popups/About.tsx     |  2 -
 src/components/MediaPlayer.tsx                |  2 +-
 src/core/eventTemplates.ts                    |  3 +-
 src/scenes/IdleMediaScene.tsx                 | 14 +++---
 7 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index c8cf5bf..d237dff 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -42,7 +42,11 @@ const App = () => {
 
   return (
     <div className="game">
-      <Canvas concurrent>
+      <Canvas
+        concurrent
+        gl={{ antialias: false }}
+        pixelRatio={1}
+      >
         <Suspense fallback={null}>
           {/*<Preloader />*/}
           {dispatchScene[currentScene as keyof typeof dispatchScene]}
diff --git a/src/components/GateScene/GateMiddleObject/BlueDigit.tsx b/src/components/GateScene/GateMiddleObject/BlueDigit.tsx
index f36a075..555420e 100644
--- a/src/components/GateScene/GateMiddleObject/BlueDigit.tsx
+++ b/src/components/GateScene/GateMiddleObject/BlueDigit.tsx
@@ -71,7 +71,7 @@ const BlueDigit = (props: BlueDigitProps) => {
 
   return (
     <a.mesh
-      scale={[0.04, 0.1, 0]}
+      scale={[props.type === 1 ? 0.04 : 0.08, 0.1, 0]}
       position-x={props.posX}
       position-y={props.posY}
       renderOrder={5}
diff --git a/src/components/IdleManager.tsx b/src/components/IdleManager.tsx
index 46f7050..6c86bfa 100644
--- a/src/components/IdleManager.tsx
+++ b/src/components/IdleManager.tsx
@@ -43,31 +43,31 @@ const IdleManager = (props: IdleManagerProps) => {
 
         if (event) handleEvent(event);
       }
-      if (now > props.idleSceneTimerRef.current + 500000) {
-        // put it on lock until the next action, since while the idle media plays, the
-        // Date.now() value keeps increasing, which can result in another idle media playing right after one finishes
-        // one way to work around this would be to modify the value depending on the last played idle media's duration
-        // but i'm way too lazy for that
-        props.idleSceneTimerRef.current = -1;
-
-        playAudio(audio.sound32);
-
-        const data = getRandomIdleMedia();
-
-        const { type, nodeName, images, media } = data;
-        let event;
-        if (type === "audio" && images && nodeName) {
-          event = playIdleAudio({
-            idleNodeName: nodeName,
-            idleImages: images,
-            idleMedia: media,
-          });
-        } else if (type === "video") {
-          event = playIdleVideo({ idleMedia: media });
-        }
-
-        if (event) handleEvent(event);
-      }
+      // if (now > props.idleSceneTimerRef.current + 5000) {
+      //   // put it on lock until the next action, since while the idle media plays, the
+      //   // Date.now() value keeps increasing, which can result in another idle media playing right after one finishes
+      //   // one way to work around this would be to modify the value depending on the last played idle media's duration
+      //   // but i'm way too lazy for that
+      //   props.idleSceneTimerRef.current = -1;
+      //
+      //   playAudio(audio.sound32);
+      //
+      //   const data = getRandomIdleMedia();
+      //
+      //   const { type, nodeName, images, media } = data;
+      //   let event;
+      //   if (type === "audio" && images && nodeName) {
+      //     event = playIdleAudio({
+      //       idleNodeName: nodeName,
+      //       idleImages: images,
+      //       idleMedia: media,
+      //     });
+      //   } else if (type === "video") {
+      //     event = playIdleVideo({ idleMedia: media });
+      //   }
+      //
+      //   if (event) handleEvent(event);
+      // }
     }
   });
 
diff --git a/src/components/MainScene/Popups/About.tsx b/src/components/MainScene/Popups/About.tsx
index c54b825..55b359b 100644
--- a/src/components/MainScene/Popups/About.tsx
+++ b/src/components/MainScene/Popups/About.tsx
@@ -10,8 +10,6 @@ const About = () => {
   const aboutBgTex = useLoader(THREE.TextureLoader, aboutBg);
 
   const bgRef = useRef<THREE.Sprite>();
-  // todo im not sure where the other bg file is located,
-  // the one here is just the text, in the original game there's another one
 
   useFrame(() => {
     if (bgRef.current) {
diff --git a/src/components/MediaPlayer.tsx b/src/components/MediaPlayer.tsx
index e060a5d..1c9c3cc 100644
--- a/src/components/MediaPlayer.tsx
+++ b/src/components/MediaPlayer.tsx
@@ -59,7 +59,7 @@ const MediaPlayer = () => {
 
   return (
     <>
-      <video width="800" height="600" id="media" ref={videoRef} controls>
+      <video width="800" height="600" id="media" ref={videoRef}>
         <track id={"track"} ref={trackRef} kind="captions" default />
       </video>
       <div id={"subtitle-container"}>
diff --git a/src/core/eventTemplates.ts b/src/core/eventTemplates.ts
index 472eae6..9402b15 100644
--- a/src/core/eventTemplates.ts
+++ b/src/core/eventTemplates.ts
@@ -709,6 +709,8 @@ export const playIdleVideo = (calculatedState: { idleMedia: string }) => ({
       mutation: {
         idleStarting: true,
         idleMedia: calculatedState.idleMedia,
+        idleImages: undefined,
+        idleNodeName: undefined,
         inputCooldown: -1,
       },
     },
@@ -739,7 +741,6 @@ export const playLainIdleAnim = (calculatedState: {
   lainMoveState: string;
   duration: number;
 }) => ({
-  // todo appropriate disable-move here also
   state: [
     {
       mutation: {
diff --git a/src/scenes/IdleMediaScene.tsx b/src/scenes/IdleMediaScene.tsx
index 2b2c805..639f20c 100644
--- a/src/scenes/IdleMediaScene.tsx
+++ b/src/scenes/IdleMediaScene.tsx
@@ -25,12 +25,14 @@ const IdleMediaScene = () => {
 
     if (mediaElement) {
       mediaElement.currentTime = 0;
-      import("../static/webvtt/" + idleNodeName + ".vtt")
-        .then((vtt) => {
-          if (vtt) trackElement.src = vtt.default;
-        })
-        // some entries have no spoken words, so the file doesnt exist. we catch that here.
-        .catch((e) => console.log(e));
+      if (idleNodeName) {
+        import("../static/webvtt/" + idleNodeName + ".vtt")
+          .then((vtt) => {
+            if (vtt) trackElement.src = vtt.default;
+          })
+          // some entries have no spoken words, so the file doesnt exist. we catch that here.
+          .catch(() => console.log("no subtitles for this media"));
+      }
 
       if (idleMedia.includes("XA")) {
         import("../static/audio/" + idleMedia + ".ogg").then((media) => {