Merge pull request #19 from roman-yagodin/master

Update website

Author: roman-yagodin

data/about/d4c1df21.md

@@ -0,0 +1,9 @@
+---
+author: Roman Yagodin
+colors: [ white ]
+---
+The Protogame project combines (in a strange way) a lot of things which is dear to me: WWW, programming, FLOSS, computer games, languages, philosophy, self-knowledge, humor, etc.
+
+You can think of it as a blog, a collection of personal notes, a game of words - that you can play with, then make your own, and then develop further in a ways that you (and probably only you) would know, understand and love.
+
+I'm trying to keep it simple, but hopefully not too stupid :)

data/marx/50935c17-ru.md

@@ -0,0 +1,8 @@
+---
+author: Karl Marx
+co-authors: [ Spinoza, Hegel ]
+lang: ru
+colors: [ white, blue ]
+---
+Необходимость слепа, пока не станет осознанной.
+Свобода - это сознание необходимости.

data/marx/50935c17y.md

@@ -0,0 +1,8 @@
+---
+author: Karl Marx
+co-authors: [ Spinoza, Hegel ]
+colors: [ white, blue ]
+link: https://www.socratic-method.com/quote-meanings-and-interpretations/karl-marx-necessity-is-blind-until-it-becomes-conscious-freedom-is-the-consciousness-of-necessity
+---
+Necessity is blind until it becomes conscious.
+Freedom is the consciousness of necessity.

js/app.js

@@ -16,6 +16,10 @@ const _3s = _1s * 3;
 const _4s = _1s * 4;
 const _5s = _1s * 5;
 
+function sec(x) {
+    return _1s * x;
+}
+
 const styles = {
     default: "\x1b[0m",
     bold: "\x1b[1m",
@@ -277,7 +281,15 @@ function getKeyString(key) {
     return "Anykey";
 }
 
-// TODO: Semi-infinite "....." prompt
+async function readAutoKey() {
+    setStyle(styles.faint + styles.white);
+    const key = await waitAutoKey(sec(5), randomInt(sec(8), sec(16)), "\r");
+    await moveCursorHome();
+    resetStyle();
+
+    return key;
+}
+
 async function readKey(prompt = "..", echo = false) {
     while (true) {
 
@@ -286,7 +298,6 @@ async function readKey(prompt = "..", echo = false) {
         await type(prompt);
         resetStyle();
 
-        // TODO: Add option to don't await input indefinitely - e.g. set timer and "run" CLS command from time to time. 
         const key = await waitKey();
 
         if (echo) {
@@ -389,11 +400,12 @@ async function puzzle1() {
         await command("CLS");
 
         await typeln(`You ${randomMsg(["see a", "enter the", "step into the"])} small, dark room covered in old webs`);
+        await wait(_hs);
         await typeln("with just table, chair and rusty terminal on it.");
         await typeln();
         await typeln("There is no doors or even windows!");
 
-        await readKey();
+        await readAutoKey();
 
         return true;
     }
@@ -444,7 +456,7 @@ async function scene2_greeting() {
     while (true) {
         const choice = await menu([
             { text: "", choice: "showMenu" },
-            { text: "Continue protogame", choice: "continue" },
+            { text: `Continue ${randomMsg(["adventure", "your journey"])}`, choice: "continue" },
             { text: "You have emails: (1)", choice: "email" },
             { text: "New protogame (resets progress)", choice: "newGame" }
         ], showMenu);
@@ -481,7 +493,7 @@ async function scene2_greeting() {
     await typeln(randomMsg(["Done.", "Done.", "Yes!", "Meow!", "Wow!", "Clap!", "Zzz...", "Shhh...", "Flip!", "Flop!", "Slap!", "Plop!", "Boom!", "Ding!"]));
     await typeln();
 
-    await readKey();
+    await readAutoKey();
 
     // to the world
     if (game.isNewGame()) {
@@ -604,7 +616,7 @@ async function scene4_world(note) {
             await typeNote(note, noteColor);
             showNote = false;
 
-            await readKey();
+            await readAutoKey();
         }
 
         // TODO: Positive/negative switch: "Don't follow"
@@ -813,6 +825,58 @@ async function scene4_world(note) {
     return false;
 }
 
+/**
+ * @param {*} silentTime Initial time to wait w/o typing anything
+ * @param {*} maxWaitTime Max. time to wait for user input before simulating key press
+ * @param {*} autoKey Key to pass as if user pressed it
+ * @returns 
+ */
+async function waitAutoKey(silentTime, maxWaitTime, autoKey) {
+    t.focus();
+    await type("..");
+
+    const pollInterval = 100;
+    const typeDelay = 500;
+    let totalWaitTime = 0;
+    let typeWaitTime = 0;
+    
+    // use it like a buffer
+    game.lastKey = null;
+    return new Promise((resolve) => {
+        const interval = setInterval(() => {
+            totalWaitTime += pollInterval;
+            
+            if (totalWaitTime > silentTime) {
+                typeWaitTime += pollInterval;
+                if (typeWaitTime > typeDelay) {
+                    t.write(".");
+                    typeWaitTime = 0;
+                }
+            }
+
+            if (totalWaitTime > maxWaitTime) {
+                game.lastKey = autoKey;
+            }
+
+            const key = game.lastKey;
+            if (key) {
+                clearInterval(interval);
+                console.log({key: game.lastKey});
+                resolve(game.lastKey);
+            }
+        }, pollInterval);
+    });
+}
+
+/** CSI Ps G: Moves cursor to column #1, without cleanup */
+async function moveCursorHome() {
+    await type("\x9B1G");
+}
+
+async function test() {
+    return true;
+}
+
 export class App {
     init() {
         const t = new Terminal({
@@ -841,6 +905,7 @@ export class App {
     }
 
     async main() {
+        //await test();
         await scene1_puzzlebox();
         await command("CLS");
         setTheme(bowTheme);