Merge pull request #13 from roman-yagodin/master

roman-yagodin · web-flow · commit 2b6b3d14e426 · 2024-03-06T14:18:16.000+03:00
Update website
diff --git a/data/carroll/f3acae8e.md b/data/carroll/f3acae8e.md
@@ -1,6 +1,6 @@
 ---
 author: Lewis Carroll
-colors: [ yellow, orange, red ]
+colors: [ white, yellow, orange, red ]
 hints:
   - How are you doing?
 ---
diff --git a/data/etc/72e07e3d.md b/data/etc/72e07e3d.md
@@ -0,0 +1,6 @@
+---
+author: Rumi
+colors: [red]
+link: https://crawl.develz.org/
+---
+If all you can do is crawl, start crawling.
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!doctype html>
   <html>
     <head>
-      <title>5D action adventure</title>
+      <title>Protogame: 5D action adventure</title>
       <meta name="viewport" content="width=device-width, initial-scale=1" />
       <link rel="stylesheet" href="css/xterm.css" />
       <link rel="stylesheet" href="css/styles.css" />
diff --git a/js/app.js b/js/app.js
@@ -6,10 +6,10 @@ import { DEBUG } from "./debug.js";
 const EOL = "\n\r";
 
 // type interval
-const _1t = 16;
+const _1t = 15;
 
 // wait intervals
-const _1s = 1000;
+const _1s = 1024;
 const _hs = _1s / 2;
 const _2s = _1s * 2;
 const _3s = _1s * 3;
@@ -150,8 +150,13 @@ async function typeln(s, typeDelay) {
     }
 }
     
-async function type(s, typeDelay = _1t) {
+async function type(s, typeDelay = -1) {
     
+    // longer type delay for longer strings
+    if (typeDelay < 0) {
+        typeDelay = s.length * 0.025 + _1t;
+    }
+
     s = s.replace("\\b", "\b");
 
     // bold
@@ -331,12 +336,12 @@ async function puzzle1() {
     await typeln();
 
     const optionSomething = {
-        text: `I ${randomMsg(["feel", "*feel*", "_feel_"])} ${randomMsg(["something", "*something*", "_something_"])}!`,
+        text: `I feel ${randomMsg(["something", "*something*", "_something_"])}!`,
         choice: "something"
     };
 
     const optionAnything = {
-        text: `I do ${randomMsg(["feel", "*feel*", "_feel_"])} ${randomMsg(["anything", "*anything*", "anything"])}.`,
+        text: `I do feel ${randomMsg(["anything", "*anything*", "anything"])}.`,
         choice: "anything"
     };
 
@@ -581,16 +586,26 @@ async function scene4_world(note) {
         }
 
         // TODO: Positive/negative switch: "Don't follow"
-        const choice = await menu([
+        let choices = [
             { text: "", choice: "showMenu" },
             { text: "Follow author.", choice: "followAuthor" },
             { text: "Follow color.", choice: "followColor" },
             { text: "Follow language.", choice: "followLanguage" },
             // TODO: Move utilities to submenu or review mode?
             { text: "Request hint.", choice: "hint" },
             { text: "Copy the note.", choice: "copy" },
+            { text: "Repeat.", choice: "repeat" },
             { text: "Leave...", choice: "leave" },
-        ], showMenu);
+        ];
+
+        if (note.id.includes("-")) {
+            choices = choices.toSpliced(4, 0, {
+                text: "In English, please!",
+                choice: "inEnglish"
+            });
+        }
+
+        const choice = await menu(choices, showMenu);
         showMenu = false;
         
         game.decrementActionCounter();
@@ -606,6 +621,12 @@ async function scene4_world(note) {
             showMenu = true;
         }
 
+        if (choice === "repeat") {
+            await typeln();
+            showNote = true;
+            showMenu = true;
+        }
+
         if (choice === "followAuthor") {
             const nextNote = game.notes.find(n => {
                 if (n.meta.author == note.meta.author && !game.state.breadCrumbs.includes(n.id)) {
@@ -669,6 +690,29 @@ async function scene4_world(note) {
             showNote = true;
             showMenu = true;
         }
+
+        if (choice === "inEnglish") {
+            const baseId = note.id.replace(/-.*/g, "");
+            const nextNote = game.notes.find(n => {
+                // count breadcrumbs or not?
+                if (n.id === baseId) {
+                    return true;
+                }
+                return false;
+            });
+
+            if (nextNote) {
+                note = nextNote;
+                game.state.breadCrumbs.push(note.id);
+                game.saveState();
+            }
+            else {
+                await reachedEOW();
+                noteColor = randomNoteColor(note);
+            }
+            showNote = true;
+            showMenu = true;
+        }
         
         if (choice === "copy") {
             const wasCopied = await copyToClipboard(note.original);
diff --git a/js/data.js b/js/data.js
