} */
const regexes = [];
+//
+// Pre-compile all regexes
for (const [left, right, replacement] of opcodes) {
- regexes.push([new RegExp(left + skipSpace + capture + skipSpace + right, "g"), replacement]);
+ regexes.push([new RegExp(left + skipSpace + capture + skipSpace + right, "gi"), replacement]);
}
/** @param {string} text */
diff --git a/server/public/index.html b/server/public/index.html
index 2cea327..5886733 100755
--- a/server/public/index.html
+++ b/server/public/index.html
@@ -7,6 +7,7 @@
+
diff --git a/server/public/site.webmanifest b/server/public/manifest.json
old mode 100644
new mode 100755
similarity index 100%
rename from server/public/site.webmanifest
rename to server/public/manifest.json
diff --git a/server/public/style.css b/server/public/style.css
index 23c3a63..c0332ea 100755
--- a/server/public/style.css
+++ b/server/public/style.css
@@ -101,12 +101,22 @@ h2 {
color: #ffaa00;
}
+/*
+*/
.error {
color: #ff4444;
}
-.input {
- color: #666;
+.calamity {
+ color: #f00;
+ text-decoration: wavy underline rgb(100 0% 00 / 40%);
+}
+
+.echo {
+ color: #888;
+}
+.echo::before {
+ content: "> ";
}
.debug {
@@ -114,7 +124,7 @@ h2 {
}
.prompt {
- color: #00ccff;
+ color: #aaa;
}
.bold {
@@ -139,12 +149,5 @@ h2 {
.faint {
opacity: 0.42;
-}
-
-.fBlue {
- color: blue;
-}
-
-.bRed {
- background-color: red;
+ color: #44f;
}
diff --git a/server/scenes/authentication/authenticationScene.js b/server/scenes/authentication/authenticationScene.js
index fab2af6..8c26578 100755
--- a/server/scenes/authentication/authenticationScene.js
+++ b/server/scenes/authentication/authenticationScene.js
@@ -2,12 +2,12 @@ import { PasswordPrompt } from "./passwordPrompt.js";
import { Player } from "../../models/player.js";
import { Scene } from "../scene.js";
import { UsernamePrompt } from "./usernamePrompt.js";
-import { CreateUsernamePrompt } from "../playerCreation/createUsernamePrompt.js";
+import { PlayerCreationScene } from "../playerCreation/playerCreationSene.js";
/** @property {Session} session */
export class AuthenticationScene extends Scene {
introText = [
- "= Welcome", //
+ "= Welcome!", //
];
/** @type {Player} */
@@ -21,6 +21,7 @@ export class AuthenticationScene extends Scene {
/** @param {Player} player */
usernameAccepted(player) {
this.player = player;
+ this.session.sendSystemMessage("salt", player.salt);
this.show(PasswordPrompt);
}
@@ -28,6 +29,9 @@ export class AuthenticationScene extends Scene {
this.player.loggedIn = true;
this.session.player = this.player;
+ this.session.sendText(["= Success!", "((but I don't know what to do now...))"]);
+ return;
+
if (this.player.admin) {
this.session.setScene("new AdminJustLoggedInScene");
} else {
@@ -35,7 +39,12 @@ export class AuthenticationScene extends Scene {
}
}
- createPlayer() {
- scene.session.setScene(new PlayerCreationScene(this.scene));
+ /**
+ * User typed `:create`
+ *
+ * Create new player
+ */
+ onColon__create() {
+ this.session.setScene(new PlayerCreationScene(this.session));
}
}
diff --git a/server/scenes/authentication/passwordPrompt.js b/server/scenes/authentication/passwordPrompt.js
index 377d082..094ced3 100755
--- a/server/scenes/authentication/passwordPrompt.js
+++ b/server/scenes/authentication/passwordPrompt.js
@@ -1,6 +1,7 @@
import { Prompt } from "../prompt.js";
import * as security from "../../utils/security.js";
import { Config } from "../../config.js";
+import { AuthenticationScene } from "./authenticationScene.js";
export class PasswordPrompt extends Prompt {
//
@@ -15,6 +16,11 @@ export class PasswordPrompt extends Prompt {
return this.scene.player;
}
+ /** @returns {AuthenticationScene} */
+ get scene() {
+ return this._scene;
+ }
+
onReply(text) {
//
// Check of the password is sane. This is both bad from a security point
@@ -70,10 +76,8 @@ export class PasswordPrompt extends Prompt {
return;
}
- this.scene.passwordAccepted();
-
- //
// Password was correct, go to main game
- this.session.setState(new JustLoggedInState(this.session));
+ // this.scene.passwordAccepted();
+ this.scene.passwordAccepted();
}
}
diff --git a/server/scenes/authentication/usernamePrompt.js b/server/scenes/authentication/usernamePrompt.js
index aebc096..2cc96c8 100755
--- a/server/scenes/authentication/usernamePrompt.js
+++ b/server/scenes/authentication/usernamePrompt.js
@@ -2,7 +2,6 @@ import { Player } from "../../models/player.js";
import { Prompt } from "../prompt.js";
import * as security from "../../utils/security.js";
import { gGame } from "../../models/globals.js";
-import { PlayerCreationScene } from "../playerCreation/playerCreationSene.js";
import { Config } from "../../config.js";
import { AuthenticationScene } from "./authenticationScene.js";
diff --git a/server/scenes/justLoggedIn/justLoggedInScene.js b/server/scenes/justLoggedIn/justLoggedInScene.js
index 16dbfe2..2b2f861 100755
--- a/server/scenes/justLoggedIn/justLoggedInScene.js
+++ b/server/scenes/justLoggedIn/justLoggedInScene.js
@@ -1,6 +1,4 @@
import { Session } from "../models/session.js";
-import { PartyCreationState } from "./partyCreationState.js";
-import { AwaitCommandsState } from "./awaitCommands.js";
const castle = `
▄
diff --git a/server/scenes/playerCreation/createUsernamePrompt.js b/server/scenes/playerCreation/createUsernamePrompt.js
index 4ad0e6e..1578810 100755
--- a/server/scenes/playerCreation/createUsernamePrompt.js
+++ b/server/scenes/playerCreation/createUsernamePrompt.js
@@ -8,7 +8,7 @@ export class CreateUsernamePrompt extends Prompt {
//
promptText = [
"Enter your username", //
- "((type *:help* for more info))" //
+ "((type *:help* for more info))", //
];
//
@@ -25,27 +25,31 @@ export class CreateUsernamePrompt extends Prompt {
// Let the client know that we're asking for a username
promptOptions = { username: true };
- onReply(text) {
+ /**
+ * @returns {PlayerCreationScene}
+ */
+ get scene() {
+ return this._scene;
+ }
+
+ onReply(username) {
//
// do basic syntax checks on usernames
- if (!security.isUsernameSane(text)) {
-
- console.info("Someone entered insane username: '%s'", text);
- this.sendError(
- "Incorrect username, try again.",
- );
+ if (!security.isUsernameSane(username)) {
+ console.info("Someone entered insane username: '%s'", username);
+ this.sendError("Incorrect username, try again.");
this.execute();
return;
}
//
// try and fetch the player object from the game
- const player = gGame.getPlayer(text);
+ const player = gGame.getPlayer(username);
//
// handle invalid username
if (player) {
- console.info("Someone tried to create a user with an occupied username: '%s'", text);
+ console.info("Someone tried to create a user with an occupied username: '%s'", username);
this.sendError("Occupied, try something else");
this.execute();
return;
@@ -53,6 +57,6 @@ export class CreateUsernamePrompt extends Prompt {
//
// Tell daddy that we're done
- this.scene.onUsernameAccepted(player);
+ this.scene.usernameAccepted(username);
}
}
diff --git a/server/scenes/playerCreation/playerCreationSene.js b/server/scenes/playerCreation/playerCreationSene.js
index 99fd6e8..0b495d2 100755
--- a/server/scenes/playerCreation/playerCreationSene.js
+++ b/server/scenes/playerCreation/playerCreationSene.js
@@ -33,7 +33,9 @@ export class PlayerCreationScene extends Scene {
this.session.sendSystemMessage("salt", player.salt);
this.session.sendText(`Username _*${username}*_ is available, and I've reserved it for you :)`);
- this.showPrompt("new passwordprompt");
+
+ //
+ this.session.sendError("TODO: create a createPasswordPrompt and display it.");
}
/**
@@ -47,10 +49,4 @@ export class PlayerCreationScene extends Scene {
this.session.sendText("*_Success_* ✅ You will now be asked to log in again, sorry for that ;)");
this.player.setPasswordHash(security.generateHash(this.password));
}
-
- //
- // User entered ":create"
- onColon__create() {
- this.scene.createPlayer();
- }
}
diff --git a/server/scenes/scene.js b/server/scenes/scene.js
index c5dfd90..b2633de 100755
--- a/server/scenes/scene.js
+++ b/server/scenes/scene.js
@@ -79,7 +79,7 @@ export class Scene {
//
// Default: we have no handler for the Foo command
if (property === undefined) {
- this.session.sendError(`You cannot ${command.toUpperCase()} right now`, { verbatim: true }); // :foo ==> you cannot FOO right now
+ this.session.sendError(`You cannot ${command.toUpperCase()} right now`); // :foo ==> you cannot FOO right now
return;
}
diff --git a/server/server.js b/server/server.js
index d39dec6..51ba961 100755
--- a/server/server.js
+++ b/server/server.js
@@ -78,9 +78,12 @@ class MudServer {
//
// The file types we allow to be served.
const contentTypes = {
- ".js": "application/javascript",
".css": "text/css",
".html": "text/html",
+ ".ico": "image/x-icon",
+ ".js": "application/javascript",
+ ".json": "application/json",
+ ".png": "image/png",
};
//
@@ -145,7 +148,7 @@ class MudServer {
// Check if message too big
if (data.byteLength > Config.maxIncomingMessageSize) {
console.error("Message was too big!", Config.maxIncomingMessageSize, data.byteLength);
- session.calamity(254, "batman");
+ session.calamity("batman");
return;
}