From e00e6b9b4c0f0b0a45e5ad3ba9591a84b401669a Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 21 Dec 2025 22:19:28 +0100 Subject: [PATCH 001/162] updated version number --- .gitignore | 1 + app/android/client/build.gradle | 4 ++-- app/android/client/src/main/res/values/strings.xml | 2 +- app/neutralinojs/neutralino.config.json | 2 +- bin/runserver.bat | 2 +- bin/runserver.sh | 2 +- build.ant.properties | 4 ++-- buildtools/mkdocs/mkdocs.yml | 2 +- doc/CHANGES.txt | 2 +- src/games/stendhal/client/update/HttpClient.java | 2 +- src/games/stendhal/common/Debug.java | 2 +- 11 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index adf7a8202c..a91f40817a 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ build_server_xmlconf /node_modules/ /log/ /build-archive/ +/bin/ diff --git a/app/android/client/build.gradle b/app/android/client/build.gradle index 6fa80a9a75..407855e0ba 100644 --- a/app/android/client/build.gradle +++ b/app/android/client/build.gradle @@ -10,8 +10,8 @@ android { applicationId namespace minSdk 21 targetSdk 32 - versionCode 1048005 - versionName "1.48.5" + versionCode 1049000 + versionName "1.49" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" targetSdkVersion 32 minSdkVersion 21 diff --git a/app/android/client/src/main/res/values/strings.xml b/app/android/client/src/main/res/values/strings.xml index fe759d152f..4bc5fd3b6d 100644 --- a/app/android/client/src/main/res/values/strings.xml +++ b/app/android/client/src/main/res/values/strings.xml @@ -5,6 +5,6 @@ Stendhal stendhalprod8gps5y99pu prod - 1.48.5 + 1.49 diff --git a/app/neutralinojs/neutralino.config.json b/app/neutralinojs/neutralino.config.json index 5113267710..e41d306327 100644 --- a/app/neutralinojs/neutralino.config.json +++ b/app/neutralinojs/neutralino.config.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/neutralinojs/neutralinojs/main/schemas/neutralino.config.schema.json", "applicationId": "org.stendhalgame.client", - "version": "1.48.5", + "version": "1.49", "defaultMode": "window", "port": 0, "documentRoot": "/resources/", diff --git a/bin/runserver.bat b/bin/runserver.bat index a6d9623195..07f0694868 100644 --- a/bin/runserver.bat +++ b/bin/runserver.bat @@ -1,6 +1,6 @@ @echo off -set STENDHAL_VERSION=1.48.5 +set STENDHAL_VERSION=1.49 set SERVER_JAR=stendhal-server-%STENDHAL_VERSION%.jar :: change to server directory diff --git a/bin/runserver.sh b/bin/runserver.sh index 1a2e475093..c725321791 100755 --- a/bin/runserver.sh +++ b/bin/runserver.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -STENDHAL_VERSION="1.48.5" +STENDHAL_VERSION="1.49" SERVER_JAR="stendhal-server-${STENDHAL_VERSION}.jar" # change to server directory diff --git a/build.ant.properties b/build.ant.properties index 427f93c1f9..b75035a282 100644 --- a/build.ant.properties +++ b/build.ant.properties @@ -92,9 +92,9 @@ version_server = http://arianne.sourceforge.net/stendhal.version # current version of stendhal version.old = 1.48 -version = 1.48.5 +version = 1.49 # FIXME: dynamic method to set this property? -version.android = 1048005 +version.android = 1049000 # javac options javac.deprecation = true diff --git a/buildtools/mkdocs/mkdocs.yml b/buildtools/mkdocs/mkdocs.yml index 1483f53630..c3b158d27a 100644 --- a/buildtools/mkdocs/mkdocs.yml +++ b/buildtools/mkdocs/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Stendhal 1.48.5 Reference Documentation +site_name: Stendhal 1.49 Reference Documentation site_description: A fun, friendly, & free multiplayer online adventure game. copyright: Copyright © 2003-2025 Stendhal site_url: https://stendhalgame.org/ diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt index e14942632c..20be3f04f1 100644 --- a/doc/CHANGES.txt +++ b/doc/CHANGES.txt @@ -12,7 +12,7 @@ Changelog *bug fixes* - fixed invalid head outfit index of Mr Ross -- fixed silent NPC fixed paths +- fixed silent NPC paths - fixed desktop webview client window freezing on Windows when closed - fixed nativehelper extension process not exiting cleanly on Windows - set User-Agent string for Wikipedia API requests diff --git a/src/games/stendhal/client/update/HttpClient.java b/src/games/stendhal/client/update/HttpClient.java index f4143f3956..e065295cb6 100644 --- a/src/games/stendhal/client/update/HttpClient.java +++ b/src/games/stendhal/client/update/HttpClient.java @@ -118,7 +118,7 @@ public class HttpClient { try { connection = (HttpURLConnection) url.openConnection(); // Wikipedia API now requires User-Agent string - connection.setRequestProperty("User-Agent", "StendhalClient/1.48.5 (https://arianne-project.org/contact.html)"); + connection.setRequestProperty("User-Agent", "StendhalClient/1.49 (https://arianne-project.org/contact.html)"); connection.setConnectTimeout(myTimeout); connection.setInstanceFollowRedirects(true); connection.setUseCaches(false); diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java index 9ff2b7ed8f..6b4849bb7d 100644 --- a/src/games/stendhal/common/Debug.java +++ b/src/games/stendhal/common/Debug.java @@ -26,7 +26,7 @@ public class Debug { /** version. */ // Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line. - public static final String VERSION = "1.48.5"; + public static final String VERSION = "1.49"; /** pre release suffix */ // Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line. From 6f783d3ef69bb6edc883d0f581f222e2ce80c0eb Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 22 Dec 2025 17:02:31 +0100 Subject: [PATCH 002/162] moved ShowItemListEvent and ShowOutfitListEvent out of EventRegistry --- doc/CHANGES.txt | 2 +- src/js/stendhal/EventRegistry.ts | 123 +------------------ src/js/stendhal/event/ShowItemListEvent.ts | 94 ++++++++++++++ src/js/stendhal/event/ShowOutfitListEvent.ts | 71 +++++++++++ 4 files changed, 170 insertions(+), 120 deletions(-) create mode 100644 src/js/stendhal/event/ShowItemListEvent.ts create mode 100644 src/js/stendhal/event/ShowOutfitListEvent.ts diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt index e14942632c..20be3f04f1 100644 --- a/doc/CHANGES.txt +++ b/doc/CHANGES.txt @@ -12,7 +12,7 @@ Changelog *bug fixes* - fixed invalid head outfit index of Mr Ross -- fixed silent NPC fixed paths +- fixed silent NPC paths - fixed desktop webview client window freezing on Windows when closed - fixed nativehelper extension process not exiting cleanly on Windows - set User-Agent string for Wikipedia API requests diff --git a/src/js/stendhal/EventRegistry.ts b/src/js/stendhal/EventRegistry.ts index f4b2448c7b..6a92619cc1 100644 --- a/src/js/stendhal/EventRegistry.ts +++ b/src/js/stendhal/EventRegistry.ts @@ -24,14 +24,11 @@ import { PlayerLoggedOnEvent } from "./event/PlayerLoggedOnEvent"; import { PlayerLoggedOutEvent } from "./event/PlayerLoggedOutEvent"; import { ProgressStatusEvent } from "./event/ProgressStatusEvent"; import { RPEvent } from "./event/RPEvent"; +import { ShowItemListEvent } from "./event/ShowItemListEvent"; +import { ShowOutfitListEvent } from "./event/ShowOutfitListEvent"; import { SoundEvent } from "./event/SoundEvent"; import { TradeEvent } from "./event/TradeEvent"; import { ViewChangeEvent } from "./event/ViewChangeEvent"; - -import { ui } from "./ui/UI"; - -import { DialogContentComponent } from "./ui/toolkit/DialogContentComponent"; - import { Chat } from "./util/Chat"; @@ -155,120 +152,8 @@ export class EventRegistry { } }); // reached_achievement - this.register("show_item_list", { - execute: function(rpobject: RPObject) { - let title = "Items"; - let caption = ""; - let items = []; - - if (this.hasOwnProperty("title")) { - title = this["title"]; - } - if (this.hasOwnProperty("caption")) { - caption = this["caption"]; - } - if (this.hasOwnProperty("content")) { - for (var obj in this["content"]) { - if (this["content"].hasOwnProperty(obj)) { - var slotObj = this["content"][obj]; - var data = this["content"][obj]["a"]; - const i = { - clazz: data["class"], - subclass: data["subclass"], - img: data["class"] + "/" + data["subclass"] + ".png", - price: data["price"], - desc: data["description_info"] - } - - // seller shops prefix prices with "-" - if (i.price.startsWith("-")) { - i.price = i.price.substr(1); - } - items.push(i); - } - } - } - - const content = new class extends DialogContentComponent {} ("empty-div-template"); - content.componentElement.classList.add("shopsign"); - const captionElement = document.createElement("div"); - captionElement.className = "horizontalgroup shopcaption"; - captionElement.textContent = caption + "\nItem\t-\tPrice\t-\tDescription"; - content.componentElement.appendChild(captionElement); - const itemList = document.createElement("div"); - itemList.className = "shoplist"; - content.componentElement.appendChild(itemList); - - // TODO: organize in columns & show item sprites - for (const i of items) { - const row = document.createElement("div"); - row.className = "horizontalgroup shoprow"; - const img = document.createElement("div"); - img.className = "shopcol"; - img.appendChild(stendhal.data.sprites.get(stendhal.paths.sprites + "/items/" + i.img)); - row.appendChild(img); - const price = document.createElement("div"); - price.className = "shopcol"; - price.textContent = i.price; - row.appendChild(price); - const desc = document.createElement("div"); - desc.className = "shopcol shopcolr"; - desc.textContent = i.desc; - row.appendChild(desc); - itemList.appendChild(row); - } - - stendhal.ui.globalInternalWindow.set( - ui.createSingletonFloatingWindow(title, content, 20, 20)); - } - }); // show_item_list - - this.register("show_outfit_list", { - execute: function(rpobject: RPObject) { - let title = "Outfits"; - let caption = ""; - let outfits = []; - - if (this.hasOwnProperty("title")) { - title = this["title"]; - } - if (this.hasOwnProperty("caption")) { - caption = this["caption"]; - } - if (this.hasOwnProperty("outfits")) { - for (let o of this["outfits"].split(":")) { - o = o.split(";"); - if (o.length > 2) { - outfits.push([o[0], o[1], o[2]]); - } - } - } - if (this.hasOwnProperty("show_base")) { - //Chat.log("normal", this["show_base"]); - } - - const content = new class extends DialogContentComponent {} ("empty-div-template"); - content.componentElement.classList.add("shopsign"); - const captionElement = document.createElement("div"); - captionElement.className = "horizontalgroup shopcaption"; - captionElement.textContent = caption; - content.componentElement.appendChild(captionElement); - const itemList = document.createElement("div"); - itemList.className = "shoplist"; - content.componentElement.appendChild(itemList); - - // TODO: organize in columns & show outfit sprites - for (const o of outfits) { - const row = document.createElement("div"); - row.className = "horizontalgroup shoprow"; - row.textContent = o[0] + ": " + o[2]; - itemList.appendChild(row); - } - - stendhal.ui.globalInternalWindow.set( - ui.createSingletonFloatingWindow(title, content, 20, 20)); - } - }); // show_outfit_list + this.register("show_item_list", new ShowItemListEvent()); + this.register("show_outfit_list", new ShowOutfitListEvent()); this.register("sound_event", new SoundEvent()); diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts new file mode 100644 index 0000000000..e09c065679 --- /dev/null +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -0,0 +1,94 @@ +/*************************************************************************** + * Copyright © 2024 - 2025 Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { RPEvent } from "./RPEvent"; + +import { ui } from "../ui/UI"; +import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; + +declare var stendhal: any; + + +export class ShowItemListEvent extends RPEvent { + + title!: string; + caption!: string; + content!: any; + + execute(_entity: any) { + let title = "Items"; + let caption = ""; + let items = []; + console.log("Items", this); + + if (this.hasOwnProperty("title")) { + title = this["title"]; + } + if (this.hasOwnProperty("caption")) { + caption = this["caption"]; + } + if (this.hasOwnProperty("content")) { + for (var obj in this["content"]) { + if (this["content"].hasOwnProperty(obj)) { + var slotObj = this["content"][obj]; + var data = this["content"][obj]["a"]; + const i = { + clazz: data["class"], + subclass: data["subclass"], + img: data["class"] + "/" + data["subclass"] + ".png", + price: data["price"], + desc: data["description_info"] + } + + // seller shops prefix prices with "-" + if (i.price.startsWith("-")) { + i.price = i.price.substr(1); + } + items.push(i); + } + } + } + + const content = new class extends DialogContentComponent { }("empty-div-template"); + content.componentElement.classList.add("shopsign"); + const captionElement = document.createElement("div"); + captionElement.className = "horizontalgroup shopcaption"; + captionElement.textContent = caption + "\nItem\t-\tPrice\t-\tDescription"; + content.componentElement.appendChild(captionElement); + const itemList = document.createElement("div"); + itemList.className = "shoplist"; + content.componentElement.appendChild(itemList); + + // TODO: organize in columns & show item sprites + for (const i of items) { + const row = document.createElement("div"); + row.className = "horizontalgroup shoprow"; + const img = document.createElement("div"); + img.className = "shopcol"; + img.appendChild(stendhal.data.sprites.get(stendhal.paths.sprites + "/items/" + i.img)); + row.appendChild(img); + const price = document.createElement("div"); + price.className = "shopcol"; + price.textContent = i.price; + row.appendChild(price); + const desc = document.createElement("div"); + desc.className = "shopcol shopcolr"; + desc.textContent = i.desc; + row.appendChild(desc); + itemList.appendChild(row); + } + + stendhal.ui.globalInternalWindow.set( + ui.createSingletonFloatingWindow(title, content, 20, 20)); + } + +} diff --git a/src/js/stendhal/event/ShowOutfitListEvent.ts b/src/js/stendhal/event/ShowOutfitListEvent.ts new file mode 100644 index 0000000000..e5f55d865f --- /dev/null +++ b/src/js/stendhal/event/ShowOutfitListEvent.ts @@ -0,0 +1,71 @@ +/*************************************************************************** + * Copyright © 2024 - 2025 Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { RPEvent } from "./RPEvent"; + +import { ui } from "../ui/UI"; +import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; + +declare var stendhal: any; + + +export class ShowOutfitListEvent extends RPEvent { + + title!: string; + caption!: string; + outfits!: string; + + execute(_entity: any) { + let title = "Outfits"; + let caption = ""; + let outfits = []; + + if (this.hasOwnProperty("title")) { + title = this["title"]; + } + if (this.hasOwnProperty("caption")) { + caption = this["caption"]; + } + if (this.hasOwnProperty("outfits")) { + for (let o of this["outfits"].split(":")) { + let parts = o.split(";"); + if (parts.length > 2) { + outfits.push([parts[0], parts[1], parts[2]]); + } + } + } + if (this.hasOwnProperty("show_base")) { + //Chat.log("normal", this["show_base"]); + } + + const content = new class extends DialogContentComponent { }("empty-div-template"); + content.componentElement.classList.add("shopsign"); + const captionElement = document.createElement("div"); + captionElement.className = "horizontalgroup shopcaption"; + captionElement.textContent = caption; + content.componentElement.appendChild(captionElement); + const itemList = document.createElement("div"); + itemList.className = "shoplist"; + content.componentElement.appendChild(itemList); + + // TODO: organize in columns & show outfit sprites + for (const o of outfits) { + const row = document.createElement("div"); + row.className = "horizontalgroup shoprow"; + row.textContent = o[0] + ": " + o[2]; + itemList.appendChild(row); + } + + stendhal.ui.globalInternalWindow.set( + ui.createSingletonFloatingWindow(title, content, 20, 20)); + } +} From 9e56945faf74401c755071d3999aaebeeba9b4e7 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 22 Dec 2025 17:31:24 +0100 Subject: [PATCH 003/162] use proper table for item shop signs --- src/js/css/main.css | 13 ++++ src/js/stendhal/event/ShowItemListEvent.ts | 77 +++++++++++++++------- 2 files changed, 66 insertions(+), 24 deletions(-) diff --git a/src/js/css/main.css b/src/js/css/main.css index 86d9b999e4..91de30c7e9 100644 --- a/src/js/css/main.css +++ b/src/js/css/main.css @@ -708,3 +708,16 @@ img#click-indicator { .pad-contents { padding: 0.5em; } + +table.shoptable { + border-collapse: collapse; +} + +table.shoptable th, table.shoptable td { + border: 1px solid var(--text-color); + padding: 2px; +} + +td.number { + text-align: right; +} diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts index e09c065679..8168988cc2 100644 --- a/src/js/stendhal/event/ShowItemListEvent.ts +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -60,33 +60,62 @@ export class ShowItemListEvent extends RPEvent { const content = new class extends DialogContentComponent { }("empty-div-template"); content.componentElement.classList.add("shopsign"); - const captionElement = document.createElement("div"); - captionElement.className = "horizontalgroup shopcaption"; - captionElement.textContent = caption + "\nItem\t-\tPrice\t-\tDescription"; - content.componentElement.appendChild(captionElement); - const itemList = document.createElement("div"); - itemList.className = "shoplist"; - content.componentElement.appendChild(itemList); + // Create table + const table = document.createElement("table"); + table.className = "shoptable"; + content.componentElement.appendChild(table); - // TODO: organize in columns & show item sprites - for (const i of items) { - const row = document.createElement("div"); - row.className = "horizontalgroup shoprow"; - const img = document.createElement("div"); - img.className = "shopcol"; - img.appendChild(stendhal.data.sprites.get(stendhal.paths.sprites + "/items/" + i.img)); - row.appendChild(img); - const price = document.createElement("div"); - price.className = "shopcol"; - price.textContent = i.price; - row.appendChild(price); - const desc = document.createElement("div"); - desc.className = "shopcol shopcolr"; - desc.textContent = i.desc; - row.appendChild(desc); - itemList.appendChild(row); + // Caption + const tableCaption = document.createElement("caption"); + tableCaption.className = "shopcaption"; + tableCaption.textContent = caption; + table.appendChild(tableCaption); + + // Header + const thead = document.createElement("thead"); + const headerRow = document.createElement("tr"); + + const headers = ["Item", "Price", "Description"]; + for (const text of headers) { + const th = document.createElement("th"); + th.textContent = text; + headerRow.appendChild(th); } + thead.appendChild(headerRow); + table.appendChild(thead); + + // Body + const tbody = document.createElement("tbody"); + + for (const i of items) { + const row = document.createElement("tr"); + + // Item (image) + const itemCell = document.createElement("td"); + itemCell.appendChild( + stendhal.data.sprites.get( + stendhal.paths.sprites + "/items/" + i.img + ) + ); + row.appendChild(itemCell); + + // Price + const priceCell = document.createElement("td"); + priceCell.className = "number"; + priceCell.textContent = i.price; + row.appendChild(priceCell); + + // Description + const descCell = document.createElement("td"); + descCell.textContent = i.desc; + row.appendChild(descCell); + + tbody.appendChild(row); + } + + table.appendChild(tbody); + stendhal.ui.globalInternalWindow.set( ui.createSingletonFloatingWindow(title, content, 20, 20)); } From a3bd4b328a3443d89ca2a998d2b67615f293ff65 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 22 Dec 2025 18:05:49 +0100 Subject: [PATCH 004/162] code cleanup --- src/js/stendhal/event/ShowItemListEvent.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts index 8168988cc2..3857a05e31 100644 --- a/src/js/stendhal/event/ShowItemListEvent.ts +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -28,7 +28,6 @@ export class ShowItemListEvent extends RPEvent { let title = "Items"; let caption = ""; let items = []; - console.log("Items", this); if (this.hasOwnProperty("title")) { title = this["title"]; @@ -37,11 +36,10 @@ export class ShowItemListEvent extends RPEvent { caption = this["caption"]; } if (this.hasOwnProperty("content")) { - for (var obj in this["content"]) { + for (let obj in this["content"]) { if (this["content"].hasOwnProperty(obj)) { - var slotObj = this["content"][obj]; - var data = this["content"][obj]["a"]; - const i = { + let data = this["content"][obj]["a"]; + let item = { clazz: data["class"], subclass: data["subclass"], img: data["class"] + "/" + data["subclass"] + ".png", @@ -50,10 +48,10 @@ export class ShowItemListEvent extends RPEvent { } // seller shops prefix prices with "-" - if (i.price.startsWith("-")) { - i.price = i.price.substr(1); + if (item.price.startsWith("-")) { + item.price = item.price.substr(1); } - items.push(i); + items.push(item); } } } From c68f0a59d5bbb0f74b56fc367905e06e6e7d2a65 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 22 Dec 2025 18:06:00 +0100 Subject: [PATCH 005/162] show outfits in shop sign dialog --- src/js/stendhal/event/ShowOutfitListEvent.ts | 103 ++++++++++++++++--- 1 file changed, 89 insertions(+), 14 deletions(-) diff --git a/src/js/stendhal/event/ShowOutfitListEvent.ts b/src/js/stendhal/event/ShowOutfitListEvent.ts index e5f55d865f..dbaf651b4f 100644 --- a/src/js/stendhal/event/ShowOutfitListEvent.ts +++ b/src/js/stendhal/event/ShowOutfitListEvent.ts @@ -39,7 +39,11 @@ export class ShowOutfitListEvent extends RPEvent { for (let o of this["outfits"].split(":")) { let parts = o.split(";"); if (parts.length > 2) { - outfits.push([parts[0], parts[1], parts[2]]); + outfits.push({ + name: parts[0], + outfit: parts[1], + price: parts[2] + }); } } } @@ -49,23 +53,94 @@ export class ShowOutfitListEvent extends RPEvent { const content = new class extends DialogContentComponent { }("empty-div-template"); content.componentElement.classList.add("shopsign"); - const captionElement = document.createElement("div"); - captionElement.className = "horizontalgroup shopcaption"; - captionElement.textContent = caption; - content.componentElement.appendChild(captionElement); - const itemList = document.createElement("div"); - itemList.className = "shoplist"; - content.componentElement.appendChild(itemList); + + const table = document.createElement("table"); + table.className = "shoptable"; + content.componentElement.appendChild(table); - // TODO: organize in columns & show outfit sprites - for (const o of outfits) { - const row = document.createElement("div"); - row.className = "horizontalgroup shoprow"; - row.textContent = o[0] + ": " + o[2]; - itemList.appendChild(row); + // Caption + const tableCaption = document.createElement("caption"); + tableCaption.className = "shopcaption"; + tableCaption.textContent = caption; + table.appendChild(tableCaption); + + // Header + const thead = document.createElement("thead"); + const headerRow = document.createElement("tr"); + + const headers = ["Name", "Outfit", "Price"]; + for (const text of headers) { + const th = document.createElement("th"); + th.textContent = text; + headerRow.appendChild(th); } + thead.appendChild(headerRow); + table.appendChild(thead); + + // Body + const tbody = document.createElement("tbody"); + + for (const outfit of outfits) { + const row = document.createElement("tr"); + + // Name + const nameCell = document.createElement("td"); + nameCell.textContent = outfit.name; + row.appendChild(nameCell); + + // Image + const imageCell = document.createElement("td"); + let url = ShowOutfitListEvent.outfitToUrl(outfit.outfit); + const img1 = document.createElement("img"); + const img2 = document.createElement("img"); + img1.src = url; + img2.src = url + "&offset=0"; + imageCell.append(img1); + imageCell.append(img2); + row.appendChild(imageCell); + + // Price + const priceCell = document.createElement("td"); + priceCell.className = "number"; + priceCell.textContent = outfit.price; + row.appendChild(priceCell); + + tbody.appendChild(row); + } + + table.appendChild(tbody); + stendhal.ui.globalInternalWindow.set( ui.createSingletonFloatingWindow(title, content, 20, 20)); } + + private static outfitToUrl(outfit?: string): string { + if (!outfit) { + return ""; + } + + // Required order + const order = ["body", "dress", "head", "mouth", "eyes", "mask", "hair", "hat", "detail"]; + + // Parse input into a map + let values: Record = {}; + + for (let part of outfit.split(",")) { + let [key, value] = part.split("="); + values[key] = Number(value); + } + + // Build path + let parts = order.map(key => { + let value = values[key] ?? 0; + return `${key}-${value}-0`; + }); + + let url = + "https://stendhalgame.org/createoutfit.php?rewritten=true&dialog=shop&outfit=" + + parts.join("_"); + + return url; + } } From 59f2ba9fbdc515c29bb813145a7b6a82dbd2174f Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 22 Dec 2025 17:02:31 +0100 Subject: [PATCH 006/162] moved ShowItemListEvent and ShowOutfitListEvent out of EventRegistry --- src/js/stendhal/EventRegistry.ts | 123 +------------------ src/js/stendhal/event/ShowItemListEvent.ts | 94 ++++++++++++++ src/js/stendhal/event/ShowOutfitListEvent.ts | 71 +++++++++++ 3 files changed, 169 insertions(+), 119 deletions(-) create mode 100644 src/js/stendhal/event/ShowItemListEvent.ts create mode 100644 src/js/stendhal/event/ShowOutfitListEvent.ts diff --git a/src/js/stendhal/EventRegistry.ts b/src/js/stendhal/EventRegistry.ts index f4b2448c7b..6a92619cc1 100644 --- a/src/js/stendhal/EventRegistry.ts +++ b/src/js/stendhal/EventRegistry.ts @@ -24,14 +24,11 @@ import { PlayerLoggedOnEvent } from "./event/PlayerLoggedOnEvent"; import { PlayerLoggedOutEvent } from "./event/PlayerLoggedOutEvent"; import { ProgressStatusEvent } from "./event/ProgressStatusEvent"; import { RPEvent } from "./event/RPEvent"; +import { ShowItemListEvent } from "./event/ShowItemListEvent"; +import { ShowOutfitListEvent } from "./event/ShowOutfitListEvent"; import { SoundEvent } from "./event/SoundEvent"; import { TradeEvent } from "./event/TradeEvent"; import { ViewChangeEvent } from "./event/ViewChangeEvent"; - -import { ui } from "./ui/UI"; - -import { DialogContentComponent } from "./ui/toolkit/DialogContentComponent"; - import { Chat } from "./util/Chat"; @@ -155,120 +152,8 @@ export class EventRegistry { } }); // reached_achievement - this.register("show_item_list", { - execute: function(rpobject: RPObject) { - let title = "Items"; - let caption = ""; - let items = []; - - if (this.hasOwnProperty("title")) { - title = this["title"]; - } - if (this.hasOwnProperty("caption")) { - caption = this["caption"]; - } - if (this.hasOwnProperty("content")) { - for (var obj in this["content"]) { - if (this["content"].hasOwnProperty(obj)) { - var slotObj = this["content"][obj]; - var data = this["content"][obj]["a"]; - const i = { - clazz: data["class"], - subclass: data["subclass"], - img: data["class"] + "/" + data["subclass"] + ".png", - price: data["price"], - desc: data["description_info"] - } - - // seller shops prefix prices with "-" - if (i.price.startsWith("-")) { - i.price = i.price.substr(1); - } - items.push(i); - } - } - } - - const content = new class extends DialogContentComponent {} ("empty-div-template"); - content.componentElement.classList.add("shopsign"); - const captionElement = document.createElement("div"); - captionElement.className = "horizontalgroup shopcaption"; - captionElement.textContent = caption + "\nItem\t-\tPrice\t-\tDescription"; - content.componentElement.appendChild(captionElement); - const itemList = document.createElement("div"); - itemList.className = "shoplist"; - content.componentElement.appendChild(itemList); - - // TODO: organize in columns & show item sprites - for (const i of items) { - const row = document.createElement("div"); - row.className = "horizontalgroup shoprow"; - const img = document.createElement("div"); - img.className = "shopcol"; - img.appendChild(stendhal.data.sprites.get(stendhal.paths.sprites + "/items/" + i.img)); - row.appendChild(img); - const price = document.createElement("div"); - price.className = "shopcol"; - price.textContent = i.price; - row.appendChild(price); - const desc = document.createElement("div"); - desc.className = "shopcol shopcolr"; - desc.textContent = i.desc; - row.appendChild(desc); - itemList.appendChild(row); - } - - stendhal.ui.globalInternalWindow.set( - ui.createSingletonFloatingWindow(title, content, 20, 20)); - } - }); // show_item_list - - this.register("show_outfit_list", { - execute: function(rpobject: RPObject) { - let title = "Outfits"; - let caption = ""; - let outfits = []; - - if (this.hasOwnProperty("title")) { - title = this["title"]; - } - if (this.hasOwnProperty("caption")) { - caption = this["caption"]; - } - if (this.hasOwnProperty("outfits")) { - for (let o of this["outfits"].split(":")) { - o = o.split(";"); - if (o.length > 2) { - outfits.push([o[0], o[1], o[2]]); - } - } - } - if (this.hasOwnProperty("show_base")) { - //Chat.log("normal", this["show_base"]); - } - - const content = new class extends DialogContentComponent {} ("empty-div-template"); - content.componentElement.classList.add("shopsign"); - const captionElement = document.createElement("div"); - captionElement.className = "horizontalgroup shopcaption"; - captionElement.textContent = caption; - content.componentElement.appendChild(captionElement); - const itemList = document.createElement("div"); - itemList.className = "shoplist"; - content.componentElement.appendChild(itemList); - - // TODO: organize in columns & show outfit sprites - for (const o of outfits) { - const row = document.createElement("div"); - row.className = "horizontalgroup shoprow"; - row.textContent = o[0] + ": " + o[2]; - itemList.appendChild(row); - } - - stendhal.ui.globalInternalWindow.set( - ui.createSingletonFloatingWindow(title, content, 20, 20)); - } - }); // show_outfit_list + this.register("show_item_list", new ShowItemListEvent()); + this.register("show_outfit_list", new ShowOutfitListEvent()); this.register("sound_event", new SoundEvent()); diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts new file mode 100644 index 0000000000..e09c065679 --- /dev/null +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -0,0 +1,94 @@ +/*************************************************************************** + * Copyright © 2024 - 2025 Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { RPEvent } from "./RPEvent"; + +import { ui } from "../ui/UI"; +import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; + +declare var stendhal: any; + + +export class ShowItemListEvent extends RPEvent { + + title!: string; + caption!: string; + content!: any; + + execute(_entity: any) { + let title = "Items"; + let caption = ""; + let items = []; + console.log("Items", this); + + if (this.hasOwnProperty("title")) { + title = this["title"]; + } + if (this.hasOwnProperty("caption")) { + caption = this["caption"]; + } + if (this.hasOwnProperty("content")) { + for (var obj in this["content"]) { + if (this["content"].hasOwnProperty(obj)) { + var slotObj = this["content"][obj]; + var data = this["content"][obj]["a"]; + const i = { + clazz: data["class"], + subclass: data["subclass"], + img: data["class"] + "/" + data["subclass"] + ".png", + price: data["price"], + desc: data["description_info"] + } + + // seller shops prefix prices with "-" + if (i.price.startsWith("-")) { + i.price = i.price.substr(1); + } + items.push(i); + } + } + } + + const content = new class extends DialogContentComponent { }("empty-div-template"); + content.componentElement.classList.add("shopsign"); + const captionElement = document.createElement("div"); + captionElement.className = "horizontalgroup shopcaption"; + captionElement.textContent = caption + "\nItem\t-\tPrice\t-\tDescription"; + content.componentElement.appendChild(captionElement); + const itemList = document.createElement("div"); + itemList.className = "shoplist"; + content.componentElement.appendChild(itemList); + + // TODO: organize in columns & show item sprites + for (const i of items) { + const row = document.createElement("div"); + row.className = "horizontalgroup shoprow"; + const img = document.createElement("div"); + img.className = "shopcol"; + img.appendChild(stendhal.data.sprites.get(stendhal.paths.sprites + "/items/" + i.img)); + row.appendChild(img); + const price = document.createElement("div"); + price.className = "shopcol"; + price.textContent = i.price; + row.appendChild(price); + const desc = document.createElement("div"); + desc.className = "shopcol shopcolr"; + desc.textContent = i.desc; + row.appendChild(desc); + itemList.appendChild(row); + } + + stendhal.ui.globalInternalWindow.set( + ui.createSingletonFloatingWindow(title, content, 20, 20)); + } + +} diff --git a/src/js/stendhal/event/ShowOutfitListEvent.ts b/src/js/stendhal/event/ShowOutfitListEvent.ts new file mode 100644 index 0000000000..e5f55d865f --- /dev/null +++ b/src/js/stendhal/event/ShowOutfitListEvent.ts @@ -0,0 +1,71 @@ +/*************************************************************************** + * Copyright © 2024 - 2025 Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { RPEvent } from "./RPEvent"; + +import { ui } from "../ui/UI"; +import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; + +declare var stendhal: any; + + +export class ShowOutfitListEvent extends RPEvent { + + title!: string; + caption!: string; + outfits!: string; + + execute(_entity: any) { + let title = "Outfits"; + let caption = ""; + let outfits = []; + + if (this.hasOwnProperty("title")) { + title = this["title"]; + } + if (this.hasOwnProperty("caption")) { + caption = this["caption"]; + } + if (this.hasOwnProperty("outfits")) { + for (let o of this["outfits"].split(":")) { + let parts = o.split(";"); + if (parts.length > 2) { + outfits.push([parts[0], parts[1], parts[2]]); + } + } + } + if (this.hasOwnProperty("show_base")) { + //Chat.log("normal", this["show_base"]); + } + + const content = new class extends DialogContentComponent { }("empty-div-template"); + content.componentElement.classList.add("shopsign"); + const captionElement = document.createElement("div"); + captionElement.className = "horizontalgroup shopcaption"; + captionElement.textContent = caption; + content.componentElement.appendChild(captionElement); + const itemList = document.createElement("div"); + itemList.className = "shoplist"; + content.componentElement.appendChild(itemList); + + // TODO: organize in columns & show outfit sprites + for (const o of outfits) { + const row = document.createElement("div"); + row.className = "horizontalgroup shoprow"; + row.textContent = o[0] + ": " + o[2]; + itemList.appendChild(row); + } + + stendhal.ui.globalInternalWindow.set( + ui.createSingletonFloatingWindow(title, content, 20, 20)); + } +} From ef6c92bd74171361f4a20346ca9c06ff4a763462 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 22 Dec 2025 17:31:24 +0100 Subject: [PATCH 007/162] use proper table for item shop signs --- src/js/css/main.css | 13 ++++ src/js/stendhal/event/ShowItemListEvent.ts | 77 +++++++++++++++------- 2 files changed, 66 insertions(+), 24 deletions(-) diff --git a/src/js/css/main.css b/src/js/css/main.css index 86d9b999e4..91de30c7e9 100644 --- a/src/js/css/main.css +++ b/src/js/css/main.css @@ -708,3 +708,16 @@ img#click-indicator { .pad-contents { padding: 0.5em; } + +table.shoptable { + border-collapse: collapse; +} + +table.shoptable th, table.shoptable td { + border: 1px solid var(--text-color); + padding: 2px; +} + +td.number { + text-align: right; +} diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts index e09c065679..8168988cc2 100644 --- a/src/js/stendhal/event/ShowItemListEvent.ts +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -60,33 +60,62 @@ export class ShowItemListEvent extends RPEvent { const content = new class extends DialogContentComponent { }("empty-div-template"); content.componentElement.classList.add("shopsign"); - const captionElement = document.createElement("div"); - captionElement.className = "horizontalgroup shopcaption"; - captionElement.textContent = caption + "\nItem\t-\tPrice\t-\tDescription"; - content.componentElement.appendChild(captionElement); - const itemList = document.createElement("div"); - itemList.className = "shoplist"; - content.componentElement.appendChild(itemList); + // Create table + const table = document.createElement("table"); + table.className = "shoptable"; + content.componentElement.appendChild(table); - // TODO: organize in columns & show item sprites - for (const i of items) { - const row = document.createElement("div"); - row.className = "horizontalgroup shoprow"; - const img = document.createElement("div"); - img.className = "shopcol"; - img.appendChild(stendhal.data.sprites.get(stendhal.paths.sprites + "/items/" + i.img)); - row.appendChild(img); - const price = document.createElement("div"); - price.className = "shopcol"; - price.textContent = i.price; - row.appendChild(price); - const desc = document.createElement("div"); - desc.className = "shopcol shopcolr"; - desc.textContent = i.desc; - row.appendChild(desc); - itemList.appendChild(row); + // Caption + const tableCaption = document.createElement("caption"); + tableCaption.className = "shopcaption"; + tableCaption.textContent = caption; + table.appendChild(tableCaption); + + // Header + const thead = document.createElement("thead"); + const headerRow = document.createElement("tr"); + + const headers = ["Item", "Price", "Description"]; + for (const text of headers) { + const th = document.createElement("th"); + th.textContent = text; + headerRow.appendChild(th); } + thead.appendChild(headerRow); + table.appendChild(thead); + + // Body + const tbody = document.createElement("tbody"); + + for (const i of items) { + const row = document.createElement("tr"); + + // Item (image) + const itemCell = document.createElement("td"); + itemCell.appendChild( + stendhal.data.sprites.get( + stendhal.paths.sprites + "/items/" + i.img + ) + ); + row.appendChild(itemCell); + + // Price + const priceCell = document.createElement("td"); + priceCell.className = "number"; + priceCell.textContent = i.price; + row.appendChild(priceCell); + + // Description + const descCell = document.createElement("td"); + descCell.textContent = i.desc; + row.appendChild(descCell); + + tbody.appendChild(row); + } + + table.appendChild(tbody); + stendhal.ui.globalInternalWindow.set( ui.createSingletonFloatingWindow(title, content, 20, 20)); } From 17003c457aafebe92818bd1ccf5594c55d36e918 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 22 Dec 2025 18:05:49 +0100 Subject: [PATCH 008/162] code cleanup --- src/js/stendhal/event/ShowItemListEvent.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts index 8168988cc2..3857a05e31 100644 --- a/src/js/stendhal/event/ShowItemListEvent.ts +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -28,7 +28,6 @@ export class ShowItemListEvent extends RPEvent { let title = "Items"; let caption = ""; let items = []; - console.log("Items", this); if (this.hasOwnProperty("title")) { title = this["title"]; @@ -37,11 +36,10 @@ export class ShowItemListEvent extends RPEvent { caption = this["caption"]; } if (this.hasOwnProperty("content")) { - for (var obj in this["content"]) { + for (let obj in this["content"]) { if (this["content"].hasOwnProperty(obj)) { - var slotObj = this["content"][obj]; - var data = this["content"][obj]["a"]; - const i = { + let data = this["content"][obj]["a"]; + let item = { clazz: data["class"], subclass: data["subclass"], img: data["class"] + "/" + data["subclass"] + ".png", @@ -50,10 +48,10 @@ export class ShowItemListEvent extends RPEvent { } // seller shops prefix prices with "-" - if (i.price.startsWith("-")) { - i.price = i.price.substr(1); + if (item.price.startsWith("-")) { + item.price = item.price.substr(1); } - items.push(i); + items.push(item); } } } From 39edb92f1c78dbe1da1d7eb9564b4b8457a9184b Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 22 Dec 2025 18:06:00 +0100 Subject: [PATCH 009/162] show outfits in shop sign dialog --- src/js/stendhal/event/ShowOutfitListEvent.ts | 103 ++++++++++++++++--- 1 file changed, 89 insertions(+), 14 deletions(-) diff --git a/src/js/stendhal/event/ShowOutfitListEvent.ts b/src/js/stendhal/event/ShowOutfitListEvent.ts index e5f55d865f..dbaf651b4f 100644 --- a/src/js/stendhal/event/ShowOutfitListEvent.ts +++ b/src/js/stendhal/event/ShowOutfitListEvent.ts @@ -39,7 +39,11 @@ export class ShowOutfitListEvent extends RPEvent { for (let o of this["outfits"].split(":")) { let parts = o.split(";"); if (parts.length > 2) { - outfits.push([parts[0], parts[1], parts[2]]); + outfits.push({ + name: parts[0], + outfit: parts[1], + price: parts[2] + }); } } } @@ -49,23 +53,94 @@ export class ShowOutfitListEvent extends RPEvent { const content = new class extends DialogContentComponent { }("empty-div-template"); content.componentElement.classList.add("shopsign"); - const captionElement = document.createElement("div"); - captionElement.className = "horizontalgroup shopcaption"; - captionElement.textContent = caption; - content.componentElement.appendChild(captionElement); - const itemList = document.createElement("div"); - itemList.className = "shoplist"; - content.componentElement.appendChild(itemList); + + const table = document.createElement("table"); + table.className = "shoptable"; + content.componentElement.appendChild(table); - // TODO: organize in columns & show outfit sprites - for (const o of outfits) { - const row = document.createElement("div"); - row.className = "horizontalgroup shoprow"; - row.textContent = o[0] + ": " + o[2]; - itemList.appendChild(row); + // Caption + const tableCaption = document.createElement("caption"); + tableCaption.className = "shopcaption"; + tableCaption.textContent = caption; + table.appendChild(tableCaption); + + // Header + const thead = document.createElement("thead"); + const headerRow = document.createElement("tr"); + + const headers = ["Name", "Outfit", "Price"]; + for (const text of headers) { + const th = document.createElement("th"); + th.textContent = text; + headerRow.appendChild(th); } + thead.appendChild(headerRow); + table.appendChild(thead); + + // Body + const tbody = document.createElement("tbody"); + + for (const outfit of outfits) { + const row = document.createElement("tr"); + + // Name + const nameCell = document.createElement("td"); + nameCell.textContent = outfit.name; + row.appendChild(nameCell); + + // Image + const imageCell = document.createElement("td"); + let url = ShowOutfitListEvent.outfitToUrl(outfit.outfit); + const img1 = document.createElement("img"); + const img2 = document.createElement("img"); + img1.src = url; + img2.src = url + "&offset=0"; + imageCell.append(img1); + imageCell.append(img2); + row.appendChild(imageCell); + + // Price + const priceCell = document.createElement("td"); + priceCell.className = "number"; + priceCell.textContent = outfit.price; + row.appendChild(priceCell); + + tbody.appendChild(row); + } + + table.appendChild(tbody); + stendhal.ui.globalInternalWindow.set( ui.createSingletonFloatingWindow(title, content, 20, 20)); } + + private static outfitToUrl(outfit?: string): string { + if (!outfit) { + return ""; + } + + // Required order + const order = ["body", "dress", "head", "mouth", "eyes", "mask", "hair", "hat", "detail"]; + + // Parse input into a map + let values: Record = {}; + + for (let part of outfit.split(",")) { + let [key, value] = part.split("="); + values[key] = Number(value); + } + + // Build path + let parts = order.map(key => { + let value = values[key] ?? 0; + return `${key}-${value}-0`; + }); + + let url = + "https://stendhalgame.org/createoutfit.php?rewritten=true&dialog=shop&outfit=" + + parts.join("_"); + + return url; + } } From a141cc187d5460a66ace7e2017baf1eb5cbf6407 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 22 Dec 2025 19:21:51 +0100 Subject: [PATCH 010/162] properly format item names in description text of shop windows --- src/js/stendhal/event/ShowItemListEvent.ts | 3 +- .../stendhal/ui/component/ChatLogComponent.ts | 126 +----------------- src/js/stendhal/util/Chat.ts | 117 ++++++++++++++++ 3 files changed, 125 insertions(+), 121 deletions(-) diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts index 3857a05e31..7b3c1f26d1 100644 --- a/src/js/stendhal/event/ShowItemListEvent.ts +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -14,6 +14,7 @@ import { RPEvent } from "./RPEvent"; import { ui } from "../ui/UI"; import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; +import { Chat } from "../util/Chat"; declare var stendhal: any; @@ -106,7 +107,7 @@ export class ShowItemListEvent extends RPEvent { // Description const descCell = document.createElement("td"); - descCell.textContent = i.desc; + descCell.innerHTML = Chat.formatLogEntry(i.desc); row.appendChild(descCell); tbody.appendChild(row); diff --git a/src/js/stendhal/ui/component/ChatLogComponent.ts b/src/js/stendhal/ui/component/ChatLogComponent.ts index d562354df6..d69e6d9640 100644 --- a/src/js/stendhal/ui/component/ChatLogComponent.ts +++ b/src/js/stendhal/ui/component/ChatLogComponent.ts @@ -14,6 +14,7 @@ import { Component } from "../toolkit/Component"; import { MenuItem } from "../../action/MenuItem"; import { UIComponentEnum } from "../UIComponentEnum"; import { singletons } from "../../SingletonRepo"; +import { Chat } from "../../util/Chat"; declare var stendhal: any; @@ -106,13 +107,13 @@ export class ChatLogComponent extends Component { /** * Adds a line of text. * - * @param type {string} + * @param type * Message type. - * @param message {string} + * @param message * Text to be added. - * @param orator {string} + * @param orator * Name of entity making the expression (default: `undefined`). - * @param timestamp {boolean} + * @param timestamp * If `false`, suppresses prepending message with timestamp (default: `true`). */ public addLine(type: string, message: string, orator?: string, timestamp=true) { @@ -131,7 +132,7 @@ export class ChatLogComponent extends Component { const rcol = document.createElement("div"); rcol.className = "logcolR log" + type; - rcol.innerHTML += this.formatLogEntry(message); + rcol.innerHTML += Chat.formatLogEntry(message); const row = document.createElement("div"); row.className = "logrow"; @@ -192,122 +193,7 @@ export class ChatLogComponent extends Component { this.add(row); } - /** - * Formats displayed text. - * - * @param message {string} - * Text to parse for special characters. - * @return {string} - * Text formatted with keywords & item names highlighted. - */ - private formatLogEntry(message: string): string { - if (!message) { - return ""; - } - let res = ""; - let delims = [" ", ",", ".", "!", "?", ":", ";"]; - let length = message.length; - let inHighlight = false, inUnderline = false, - inHighlightQuote = false, inUnderlineQuote = false; - for (let i = 0; i < length; i++) { - let c = message[i]; - if (c === "\\") { - let n = message[i + 1]; - res += n; - i++; - - // Highlight Start? - } else if (c === "#") { - if (inHighlight) { - res += c; - continue; - } - let n = message[i + 1]; - if (n === "#") { - res += c; - i++; - continue; - } - if (n === "'") { - inHighlightQuote = true; - i++; - } - inHighlight = true; - res += ""; - - // Underline start? - } else if (c === "§") { - if (inUnderline) { - res += c; - continue; - } - let n = message[i + 1]; - if (n === "§") { - res += c; - i++; - continue; - } - if (n === "'") { - inUnderlineQuote = true; - i++; - } - inUnderline = true; - res += ""; - - // End Highlight and Underline? - } else if (c === "'") { - if (inUnderlineQuote) { - inUnderline = false; - inUnderlineQuote = false; - res += ""; - continue; - } - if (inHighlightQuote) { - inHighlight = false; - inHighlightQuote = false; - res += ""; - continue; - } - res += c; - - // HTML escape - } else if (c === "<") { - res += "<"; - - // End of word - } else if (delims.indexOf(c) > -1) { - let n = message[i + 1]; - if (c === " " || n === " " || n == undefined) { - if (inUnderline && !inUnderlineQuote && !inHighlightQuote) { - inUnderline = false; - res += "" + c; - continue; - } - if (inHighlight && !inUnderlineQuote && !inHighlightQuote) { - inHighlight = false; - res += "" + c; - continue; - } - } - res += c; - - // Normal characters - } else { - res += c; - } - } - - // Close opened formattings - if (inUnderline) { - res += ""; - } - if (inHighlight) { - res += ""; - } - - return res; - } /** * Removes all text from log. diff --git a/src/js/stendhal/util/Chat.ts b/src/js/stendhal/util/Chat.ts index 7542391971..8bda707e37 100644 --- a/src/js/stendhal/util/Chat.ts +++ b/src/js/stendhal/util/Chat.ts @@ -99,4 +99,121 @@ export class Chat { Chat.log("client", message); } } + + /** + * Formats displayed text. + * + * @param message {string} + * Text to parse for special characters. + * @return {string} + * Text formatted with keywords & item names highlighted. + */ + public static formatLogEntry(message: string): string { + if (!message) { + return ""; + } + let res = ""; + let delims = [" ", ",", ".", "!", "?", ":", ";"]; + let length = message.length; + let inHighlight = false, inUnderline = false, + inHighlightQuote = false, inUnderlineQuote = false; + for (let i = 0; i < length; i++) { + let c = message[i]; + + if (c === "\\") { + let n = message[i + 1]; + res += n; + i++; + + // Highlight Start? + } else if (c === "#") { + if (inHighlight) { + res += c; + continue; + } + let n = message[i + 1]; + if (n === "#") { + res += c; + i++; + continue; + } + if (n === "'") { + inHighlightQuote = true; + i++; + } + inHighlight = true; + res += ""; + + // Underline start? + } else if (c === "§") { + if (inUnderline) { + res += c; + continue; + } + let n = message[i + 1]; + if (n === "§") { + res += c; + i++; + continue; + } + if (n === "'") { + inUnderlineQuote = true; + i++; + } + inUnderline = true; + res += ""; + + // End Highlight and Underline? + } else if (c === "'") { + if (inUnderlineQuote) { + inUnderline = false; + inUnderlineQuote = false; + res += ""; + continue; + } + if (inHighlightQuote) { + inHighlight = false; + inHighlightQuote = false; + res += ""; + continue; + } + res += c; + + // HTML escape + } else if (c === "<") { + res += "<"; + + // End of word + } else if (delims.indexOf(c) > -1) { + let n = message[i + 1]; + if (c === " " || n === " " || n == undefined) { + if (inUnderline && !inUnderlineQuote && !inHighlightQuote) { + inUnderline = false; + res += "" + c; + continue; + } + if (inHighlight && !inUnderlineQuote && !inHighlightQuote) { + inHighlight = false; + res += "" + c; + continue; + } + } + res += c; + + // Normal characters + } else { + res += c; + } + } + + // Close opened formattings + if (inUnderline) { + res += ""; + } + if (inHighlight) { + res += ""; + } + + return res; + } } From 05d1fb34afbebfd7c5ab8e725c5bd19f375dc6b6 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 22 Dec 2025 19:21:51 +0100 Subject: [PATCH 011/162] properly format item names in description text of shop windows --- src/js/stendhal/event/ShowItemListEvent.ts | 3 +- .../stendhal/ui/component/ChatLogComponent.ts | 126 +----------------- src/js/stendhal/util/Chat.ts | 117 ++++++++++++++++ 3 files changed, 125 insertions(+), 121 deletions(-) diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts index 3857a05e31..7b3c1f26d1 100644 --- a/src/js/stendhal/event/ShowItemListEvent.ts +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -14,6 +14,7 @@ import { RPEvent } from "./RPEvent"; import { ui } from "../ui/UI"; import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; +import { Chat } from "../util/Chat"; declare var stendhal: any; @@ -106,7 +107,7 @@ export class ShowItemListEvent extends RPEvent { // Description const descCell = document.createElement("td"); - descCell.textContent = i.desc; + descCell.innerHTML = Chat.formatLogEntry(i.desc); row.appendChild(descCell); tbody.appendChild(row); diff --git a/src/js/stendhal/ui/component/ChatLogComponent.ts b/src/js/stendhal/ui/component/ChatLogComponent.ts index d562354df6..d69e6d9640 100644 --- a/src/js/stendhal/ui/component/ChatLogComponent.ts +++ b/src/js/stendhal/ui/component/ChatLogComponent.ts @@ -14,6 +14,7 @@ import { Component } from "../toolkit/Component"; import { MenuItem } from "../../action/MenuItem"; import { UIComponentEnum } from "../UIComponentEnum"; import { singletons } from "../../SingletonRepo"; +import { Chat } from "../../util/Chat"; declare var stendhal: any; @@ -106,13 +107,13 @@ export class ChatLogComponent extends Component { /** * Adds a line of text. * - * @param type {string} + * @param type * Message type. - * @param message {string} + * @param message * Text to be added. - * @param orator {string} + * @param orator * Name of entity making the expression (default: `undefined`). - * @param timestamp {boolean} + * @param timestamp * If `false`, suppresses prepending message with timestamp (default: `true`). */ public addLine(type: string, message: string, orator?: string, timestamp=true) { @@ -131,7 +132,7 @@ export class ChatLogComponent extends Component { const rcol = document.createElement("div"); rcol.className = "logcolR log" + type; - rcol.innerHTML += this.formatLogEntry(message); + rcol.innerHTML += Chat.formatLogEntry(message); const row = document.createElement("div"); row.className = "logrow"; @@ -192,122 +193,7 @@ export class ChatLogComponent extends Component { this.add(row); } - /** - * Formats displayed text. - * - * @param message {string} - * Text to parse for special characters. - * @return {string} - * Text formatted with keywords & item names highlighted. - */ - private formatLogEntry(message: string): string { - if (!message) { - return ""; - } - let res = ""; - let delims = [" ", ",", ".", "!", "?", ":", ";"]; - let length = message.length; - let inHighlight = false, inUnderline = false, - inHighlightQuote = false, inUnderlineQuote = false; - for (let i = 0; i < length; i++) { - let c = message[i]; - if (c === "\\") { - let n = message[i + 1]; - res += n; - i++; - - // Highlight Start? - } else if (c === "#") { - if (inHighlight) { - res += c; - continue; - } - let n = message[i + 1]; - if (n === "#") { - res += c; - i++; - continue; - } - if (n === "'") { - inHighlightQuote = true; - i++; - } - inHighlight = true; - res += ""; - - // Underline start? - } else if (c === "§") { - if (inUnderline) { - res += c; - continue; - } - let n = message[i + 1]; - if (n === "§") { - res += c; - i++; - continue; - } - if (n === "'") { - inUnderlineQuote = true; - i++; - } - inUnderline = true; - res += ""; - - // End Highlight and Underline? - } else if (c === "'") { - if (inUnderlineQuote) { - inUnderline = false; - inUnderlineQuote = false; - res += ""; - continue; - } - if (inHighlightQuote) { - inHighlight = false; - inHighlightQuote = false; - res += ""; - continue; - } - res += c; - - // HTML escape - } else if (c === "<") { - res += "<"; - - // End of word - } else if (delims.indexOf(c) > -1) { - let n = message[i + 1]; - if (c === " " || n === " " || n == undefined) { - if (inUnderline && !inUnderlineQuote && !inHighlightQuote) { - inUnderline = false; - res += "" + c; - continue; - } - if (inHighlight && !inUnderlineQuote && !inHighlightQuote) { - inHighlight = false; - res += "" + c; - continue; - } - } - res += c; - - // Normal characters - } else { - res += c; - } - } - - // Close opened formattings - if (inUnderline) { - res += ""; - } - if (inHighlight) { - res += ""; - } - - return res; - } /** * Removes all text from log. diff --git a/src/js/stendhal/util/Chat.ts b/src/js/stendhal/util/Chat.ts index 7542391971..8bda707e37 100644 --- a/src/js/stendhal/util/Chat.ts +++ b/src/js/stendhal/util/Chat.ts @@ -99,4 +99,121 @@ export class Chat { Chat.log("client", message); } } + + /** + * Formats displayed text. + * + * @param message {string} + * Text to parse for special characters. + * @return {string} + * Text formatted with keywords & item names highlighted. + */ + public static formatLogEntry(message: string): string { + if (!message) { + return ""; + } + let res = ""; + let delims = [" ", ",", ".", "!", "?", ":", ";"]; + let length = message.length; + let inHighlight = false, inUnderline = false, + inHighlightQuote = false, inUnderlineQuote = false; + for (let i = 0; i < length; i++) { + let c = message[i]; + + if (c === "\\") { + let n = message[i + 1]; + res += n; + i++; + + // Highlight Start? + } else if (c === "#") { + if (inHighlight) { + res += c; + continue; + } + let n = message[i + 1]; + if (n === "#") { + res += c; + i++; + continue; + } + if (n === "'") { + inHighlightQuote = true; + i++; + } + inHighlight = true; + res += ""; + + // Underline start? + } else if (c === "§") { + if (inUnderline) { + res += c; + continue; + } + let n = message[i + 1]; + if (n === "§") { + res += c; + i++; + continue; + } + if (n === "'") { + inUnderlineQuote = true; + i++; + } + inUnderline = true; + res += ""; + + // End Highlight and Underline? + } else if (c === "'") { + if (inUnderlineQuote) { + inUnderline = false; + inUnderlineQuote = false; + res += ""; + continue; + } + if (inHighlightQuote) { + inHighlight = false; + inHighlightQuote = false; + res += ""; + continue; + } + res += c; + + // HTML escape + } else if (c === "<") { + res += "<"; + + // End of word + } else if (delims.indexOf(c) > -1) { + let n = message[i + 1]; + if (c === " " || n === " " || n == undefined) { + if (inUnderline && !inUnderlineQuote && !inHighlightQuote) { + inUnderline = false; + res += "" + c; + continue; + } + if (inHighlight && !inUnderlineQuote && !inHighlightQuote) { + inHighlight = false; + res += "" + c; + continue; + } + } + res += c; + + // Normal characters + } else { + res += c; + } + } + + // Close opened formattings + if (inUnderline) { + res += ""; + } + if (inHighlight) { + res += ""; + } + + return res; + } } From cbe0825e9b46f2a8adf9adce8c5747ece13b17a0 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 23 Dec 2025 08:49:29 +0100 Subject: [PATCH 012/162] updated release notes --- .../client/src/main/play/release-notes/en-US/default.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/android/client/src/main/play/release-notes/en-US/default.txt b/app/android/client/src/main/play/release-notes/en-US/default.txt index 70b8142595..0a67955601 100644 --- a/app/android/client/src/main/play/release-notes/en-US/default.txt +++ b/app/android/client/src/main/play/release-notes/en-US/default.txt @@ -1,3 +1,5 @@ -PUT RELEASE ANNOUNCEMENT LINES HERE +The outfit merchants display images of their products now. In order not to fall behind, item sellers have polished their shop signs, to highlight item names. + +This in turn prompted Gwen at Deniarn Accessories to cut her prices in half. All in all, it is a good time for some late Christmas shopping. Please see the complete change log for further details: https://arianne-project.org/game/stendhal.html#changes From 7beb1231177136a60d36598f09ed961225094d1a Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 17:11:58 -0800 Subject: [PATCH 013/162] Allow dispatching Android build workflow manually --- .github/workflows/android-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index c550b69f66..856577855d 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - 'app/android/**' + workflow_dispatch: jobs: build: From e910892a16e67bbfea715f31f6819ec8988cdd4a Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 17:31:39 -0800 Subject: [PATCH 014/162] Build .apk packages using Ant in Android Build Test GitHub workflow --- .github/workflows/android-build.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 856577855d..5776473de2 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -14,10 +14,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout Repository + uses: actions/checkout@v3 - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + - name: Set Up JDK 21 + uses: actions/setup-java@v3 + with: + java-version: '21' + distribution: 'adopt' - - name: Build Android Packages - run: cd app/android/client && gradle assemble + - name: Build APKs with Ant + uses: cedx/setup-ant@v6 + with: + version: '1.10' + run: ant -noinput -buildfile build.xml android -Dgradle.params="assembleDebug assembleRelease" From c4491004d2fe04fe4fa6e7847a8636e804a0107a Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 18:05:36 -0800 Subject: [PATCH 015/162] Parse job ID in Android Build Test GitHub workflow --- .github/workflows/android-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 5776473de2..7ca4d75e71 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -14,6 +14,12 @@ jobs: runs-on: ubuntu-latest steps: + - id: job_info + uses: daleyjem/gh-job-id@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + job_name: 'build' + - name: Checkout Repository uses: actions/checkout@v3 From 31c4f9cfb432f7fa161d147e22a2485d36589963 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 18:07:00 -0800 Subject: [PATCH 016/162] Discord webhook for Android Build Test failure --- .github/workflows/android-build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 7ca4d75e71..a4d9e0478f 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -34,3 +34,12 @@ jobs: with: version: '1.10' run: ant -noinput -buildfile build.xml android -Dgradle.params="assembleDebug assembleRelease" + + - name: Failure Report + uses: sarisia/actions-status-discord@v1 + if: failure() + env: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_DEVLOG }} + with: + title: 'Android Build Failed' + description: '${{ steps.job_info.outputs.html_url }}' From 179bc4d5e706bc3cea91e562cdc3516c8a3b37cb Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 18:10:25 -0800 Subject: [PATCH 017/162] Fix code alignment in Android Build Test GitHub workflow --- .github/workflows/android-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index a4d9e0478f..9edfb5b6e4 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -33,7 +33,7 @@ jobs: uses: cedx/setup-ant@v6 with: version: '1.10' - run: ant -noinput -buildfile build.xml android -Dgradle.params="assembleDebug assembleRelease" + run: ant -noinput -buildfile build.xml android -Dgradle.params="assembleDebug assembleRelease" - name: Failure Report uses: sarisia/actions-status-discord@v1 From a5db37305efd551d8fd309625c7551712e63d769 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 18:13:57 -0800 Subject: [PATCH 018/162] Fix 'run' line --- .github/workflows/android-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 9edfb5b6e4..6e479c2457 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -33,7 +33,7 @@ jobs: uses: cedx/setup-ant@v6 with: version: '1.10' - run: ant -noinput -buildfile build.xml android -Dgradle.params="assembleDebug assembleRelease" + - run: ant -noinput -buildfile build.xml android -Dgradle.params="assembleDebug assembleRelease" - name: Failure Report uses: sarisia/actions-status-discord@v1 From 049b91e98b2f247423ffa1ce11f247f7257062a7 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 18:21:01 -0800 Subject: [PATCH 019/162] Don't send details to Discord --- .github/workflows/android-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 6e479c2457..85d117420a 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -43,3 +43,4 @@ jobs: with: title: 'Android Build Failed' description: '${{ steps.job_info.outputs.html_url }}' + nodetail: true From 7174c32521d78642ea96feca4d1dc0bd3b9a8290 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 18:21:32 -0800 Subject: [PATCH 020/162] Send Android Build error report to Discord dev channel --- .github/workflows/android-build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 85d117420a..62b3f0de49 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -37,6 +37,14 @@ jobs: - name: Failure Report uses: sarisia/actions-status-discord@v1 + if: failure() + env: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_DEVELOPMENT }} + with: + title: 'Android Build Failed' + description: '${{ steps.job_info.outputs.html_url }}' + nodetail: true + - uses: sarisia/actions-status-discord@v1 if: failure() env: DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_DEVLOG }} From f7565348469005e44341962439bd6b5da532d7c3 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 21:59:21 -0800 Subject: [PATCH 021/162] Validate Gradle Wrapper distribution checksum not .jar checksum --- app/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties index 0176d15822..b916c04dbb 100644 --- a/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/app/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=91a239400bb638f36a1795d8fdf7939d532cdc7d794d1119b7261aac158b1e60 +distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 2e5dbc12c691c9c26c2f6b284aeb0f8255b1b8f1 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 22:01:09 -0800 Subject: [PATCH 022/162] Validate Gradle Wrapper .jar in Android Build Test workflow --- .github/workflows/android-build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 62b3f0de49..bcb0a0096e 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -29,6 +29,14 @@ jobs: java-version: '21' distribution: 'adopt' + - name: Validate Gradle Wrapper .jar + run: | + cd app/android/gradle/wrapper + curl --location --output gradle-wrapper.jar.sha256 \ + https://services.gradle.org/distributions/gradle-7.5.1-wrapper.jar.sha256 + echo " gradle-wrapper.jar" >> gradle-wrapper.jar.sha256 + sha256sum --check gradle-wrapper.jar.sha256 + - name: Build APKs with Ant uses: cedx/setup-ant@v6 with: From cc5414894f39a22fe90aeb53cd054823d645aa82 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Wed, 24 Dec 2025 22:10:38 -0800 Subject: [PATCH 023/162] Use JDK version 17 in Android Build Test workflow Current bundled Gradle Wrapper version is 7.5.1, which isn't compatible with more recent Java releases. --- .github/workflows/android-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index bcb0a0096e..710be77781 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -23,10 +23,10 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - - name: Set Up JDK 21 + - name: Set Up JDK uses: actions/setup-java@v3 with: - java-version: '21' + java-version: '17' distribution: 'adopt' - name: Validate Gradle Wrapper .jar From a000e5f788459649eab3d23aae32a2b7e6512bef Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 26 Dec 2025 14:41:21 +0100 Subject: [PATCH 024/162] made blend layer available --- src/js/stendhal/data/Map.ts | 7 +++++-- src/js/stendhal/landscape/CombinedTilesetFactory.ts | 11 ++++++++++- .../stendhal/landscape/CombinedTilesetImageLoader.ts | 5 ++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/js/stendhal/data/Map.ts b/src/js/stendhal/data/Map.ts index b3a8c79364..35cad5657d 100644 --- a/src/js/stendhal/data/Map.ts +++ b/src/js/stendhal/data/Map.ts @@ -45,11 +45,12 @@ export class Map { private targetTileWidth = 0; private targetTileHeight = 0; - private readonly layerGroups: any = [ + public readonly layerGroups = [ ["0_floor", "1_terrain", "2_object"], ["3_roof", "4_roof_add"] ]; - private layerGroupIndexes: any; + public readonly blendLayers = ["blend_ground", "blend_roof"] + public layerGroupIndexes: any; private strategy: LandscapeRenderingStrategy; private protection: any; @@ -124,6 +125,8 @@ export class Map { this.decodeMapLayer(content, "2_object"); this.decodeMapLayer(content, "3_roof"); this.decodeMapLayer(content, "4_roof_add"); + this.decodeMapLayer(content, "blend_ground"); + this.decodeMapLayer(content, "blend_roof"); this.protection = this.decodeMapLayer(content, "protection"); this.collisionData = this.decodeMapLayer(content, "collision"); this.layerGroupIndexes = this.mapLayerGroup(); diff --git a/src/js/stendhal/landscape/CombinedTilesetFactory.ts b/src/js/stendhal/landscape/CombinedTilesetFactory.ts index 245266fdf0..b71b5a3eaf 100644 --- a/src/js/stendhal/landscape/CombinedTilesetFactory.ts +++ b/src/js/stendhal/landscape/CombinedTilesetFactory.ts @@ -33,7 +33,15 @@ export class CombinedTilesetFactory { for (let group = 0; group < this.map.layerGroupIndexes.length; group++) { let layers = this.map.layerGroupIndexes[group]; + let blendLayer = this.map.layerNames.indexOf(this.map.blendLayers[group]); let combinedTile = [] + + if (blendLayer && this.map.layers[blendLayer]) { + combinedTile.push(this.map.layers[blendLayer][y * this.map.zoneSizeX + x]); + } else { + combinedTile.push(0); + } + for (let layer of layers) { let gid = this.map.layers[layer][y * this.map.zoneSizeX + x]; if (gid > 0) { @@ -43,7 +51,8 @@ export class CombinedTilesetFactory { // most of the tiles on the roof layer are empty, so we add a special case here // to skip drawing completely transparent tiles later. - if (combinedTile.length === 0) { + // In this case, we ignore the entry on the blend layer + if (combinedTile.length <= 1) { combinedLayers[group][y * this.map.zoneSizeX + x] = -1 continue; } diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index 8c792338bc..94f586ba54 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -97,7 +97,10 @@ export class CombinedTilesetImageLoader { const pixelY = y * this.map.tileHeight; this.combinedTileset.ctx.clearRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); - for (let tile of tiles) { + for (let [i, tile] of tiles.entries()) { + if (i === 0) { + continue; // skip blend layer + } let flip = tile & 0xE0000000; let gid = tile & 0x1FFFFFFF; let tileset = this.map.getTilesetForGid(gid); From 0d56d2b63bf8431bdcfa3d71fdcc3f93c1819666 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 26 Dec 2025 14:57:00 +0100 Subject: [PATCH 025/162] renamed Map to TileMap and use type definition --- src/js/stendhal/Client.ts | 2 +- src/js/stendhal/SingletonRepo.ts | 6 +- src/js/stendhal/data/{Map.ts => TileMap.ts} | 64 +++++++++---------- .../landscape/CombinedTilesetFactory.ts | 3 +- .../landscape/CombinedTilesetImageLoader.ts | 3 +- .../IndividualTilesetRenderingStrategy.ts | 3 +- .../landscape/LandscapeRenderingStrategy.ts | 5 +- 7 files changed, 45 insertions(+), 41 deletions(-) rename src/js/stendhal/data/{Map.ts => TileMap.ts} (89%) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index 9e0298af15..6cfb9ecdba 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -119,7 +119,7 @@ export class Client { stendhal.data.group = singletons.getGroupManager(); stendhal.data.outfit = singletons.getOutfitStore(); stendhal.data.sprites = singletons.getSpriteStore(); - stendhal.data.map = singletons.getMap(); + stendhal.data.map = singletons.getTileMap(); // online players stendhal.players = []; } diff --git a/src/js/stendhal/SingletonRepo.ts b/src/js/stendhal/SingletonRepo.ts index 4e7827b3d8..bdfc331d7f 100644 --- a/src/js/stendhal/SingletonRepo.ts +++ b/src/js/stendhal/SingletonRepo.ts @@ -27,7 +27,7 @@ import { CStatus } from "./data/CStatus"; import { CacheManager } from "./data/CacheManager"; import { EmojiStore } from "./data/EmojiStore"; import { GroupManager } from "./data/GroupManager"; -import { Map } from "./data/Map"; +import { TileMap } from "./data/TileMap"; import { OutfitStore } from "./data/OutfitStore"; import { Paths } from "./data/Paths"; import { SpriteStore, store } from "./data/SpriteStore"; @@ -119,8 +119,8 @@ export class SingletonRepo { return LoopedSoundSourceManager.get(); } - static getMap(): Map { - return Map.get(); + static getTileMap(): TileMap { + return TileMap.get(); } static getOutfitStore(): OutfitStore { diff --git a/src/js/stendhal/data/Map.ts b/src/js/stendhal/data/TileMap.ts similarity index 89% rename from src/js/stendhal/data/Map.ts rename to src/js/stendhal/data/TileMap.ts index 35cad5657d..6c5fd81167 100644 --- a/src/js/stendhal/data/Map.ts +++ b/src/js/stendhal/data/TileMap.ts @@ -19,31 +19,31 @@ import { IndividualTilesetRenderingStrategy } from "../landscape/IndividualTiles import { ParallaxBackground } from "../landscape/ParallaxBackground"; -export class Map { +export class TileMap { - private currentZoneName = ""; + public currentZoneName = ""; - private offsetX = 0; - private offsetY = 0; - private zoneSizeX = -1; - private zoneSizeY = -1; - private sizeX = 20; - private sizeY = 15; + public offsetX = 0; + public offsetY = 0; + public zoneSizeX = -1; + public zoneSizeY = -1; + public sizeX = 20; + public sizeY = 15; - private tileWidth = 32; - private tileHeight = 32; - private zoom = 100; + public tileWidth = 32; + public tileHeight = 32; + public zoom = 100; - private tilesetFilenames: string[] = []; - private aImages = -1; - private layerNames: any = -1; - private layers: any = -1; - private firstgids: any = -1; - private gidsindex: any = []; + public tilesetFilenames: string[] = []; + public aImages = -1; + public layerNames: any = -1; + public layers: any = -1; + public firstgids: any = -1; + public gidsindex: any = []; - private drawingError = false; - private targetTileWidth = 0; - private targetTileHeight = 0; + public drawingError = false; + public targetTileWidth = 0; + public targetTileHeight = 0; public readonly layerGroups = [ ["0_floor", "1_terrain", "2_object"], @@ -52,12 +52,12 @@ export class Map { public readonly blendLayers = ["blend_ground", "blend_roof"] public layerGroupIndexes: any; - private strategy: LandscapeRenderingStrategy; - private protection: any; - private collisionData: any; + public strategy: LandscapeRenderingStrategy; + public protection: any; + public collisionData: any; // alternatives for known images that may be considered violent or mature - private knownSafeTilesets: string[] = [ + public knownSafeTilesets: string[] = [ Paths.tileset + "/item/armor/bloodied_small_axe", Paths.tileset + "/item/blood/floor_stain", Paths.tileset + "/item/blood/floor_stains_2", @@ -65,22 +65,22 @@ export class Map { Paths.tileset + "/item/blood/small_stains" ]; - private parallax: ParallaxBackground; - private parallaxImage?: string; - private ignoredTiles: string[]; + public parallax: ParallaxBackground; + public parallaxImage?: string; + public ignoredTiles: string[]; /** Singleton instance. */ - private static instance: Map; + private static instance: TileMap; /** * Retrieves singleton instance. */ - static get(): Map { - if (!Map.instance) { - Map.instance = new Map(); + static get(): TileMap { + if (!TileMap.instance) { + TileMap.instance = new TileMap(); } - return Map.instance; + return TileMap.instance; } /** diff --git a/src/js/stendhal/landscape/CombinedTilesetFactory.ts b/src/js/stendhal/landscape/CombinedTilesetFactory.ts index b71b5a3eaf..7b27381dc7 100644 --- a/src/js/stendhal/landscape/CombinedTilesetFactory.ts +++ b/src/js/stendhal/landscape/CombinedTilesetFactory.ts @@ -9,12 +9,13 @@ * * ***************************************************************************/ +import { TileMap } from "../data/TileMap"; import { CombinedTileset } from "./CombinedTileset"; import { CombinedTilesetImageLoader } from "./CombinedTilesetImageLoader"; export class CombinedTilesetFactory { - constructor(private map: any) {} + constructor(private map: TileMap) {} combine(): CombinedTileset { let combinedTilesToIndex: Map = new Map(); diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index 94f586ba54..05292b3492 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { TileMap } from "../data/TileMap"; import { TileStore } from "../data/TileStore"; import { MapOfSets } from "../util/MapOfSets"; import { CombinedTileset } from "./CombinedTileset"; @@ -23,7 +24,7 @@ export class CombinedTilesetImageLoader { private landscapeAnimationMap: any; constructor( - private map: any, + private map: TileMap, private indexToCombinedTiles: Map, private combinedTileset: CombinedTileset) { this.landscapeAnimationMap = TileStore.get().getLandscapeMap(); diff --git a/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts b/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts index 60ed83c047..ef1f4a9e3c 100644 --- a/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts +++ b/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts @@ -14,6 +14,7 @@ declare var stendhal: any; import { LandscapeRenderingStrategy } from "./LandscapeRenderingStrategy"; import { ImagePreloader } from "../data/ImagePreloader"; import { Chat } from "../util/Chat"; +import { TileMap } from "../data/TileMap"; export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrategy { @@ -28,7 +29,7 @@ export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrate }, 1000); } - public onMapLoaded(_map: any): void { + public onMapLoaded(_map: TileMap): void { // do nothing console.log("Using IndividualTilesetRenderingStrategy.") } diff --git a/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts b/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts index 61db62bf4c..83a81281b9 100644 --- a/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts +++ b/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { TileMap } from "../data/TileMap"; import { CombinedTilesetFactory } from "./CombinedTilesetFactory"; import { LandscapeRenderer } from "./LandscapeRenderer"; @@ -17,7 +18,7 @@ declare var stendhal: any; export abstract class LandscapeRenderingStrategy { - public abstract onMapLoaded(map: any): void; + public abstract onMapLoaded(map: TileMap): void; public abstract onTilesetLoaded(): void; @@ -29,7 +30,7 @@ export abstract class LandscapeRenderingStrategy { export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy { - public onMapLoaded(map: any): void { + public onMapLoaded(map: TileMap): void { let combinedTilesetFactory = new CombinedTilesetFactory(map); stendhal.data.map.combinedTileset = combinedTilesetFactory.combine(); } From d1d4eb5c499dbe69bd045841596e6fee01d70f41 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 27 Dec 2025 13:00:05 +0100 Subject: [PATCH 026/162] removed setting alpha in applyHSLFilter method --- src/js/stendhal/ui/ViewPort.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index 51d071942c..1d9650a21d 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -198,9 +198,6 @@ export class ViewPort { return; } this.ctx.save(); - // FIXME: is this the appropriate alpha level to use? "color_method" value from server doesn't - // appear to include alpha information - this.ctx.globalAlpha = 0.75; this.ctx.globalCompositeOperation = (this.colorMethod || this.ctx.globalCompositeOperation) as GlobalCompositeOperation; this.ctx.fillStyle = this.HSLFilter; this.ctx.fillRect(this.offsetX, this.offsetY, this.ctx.canvas.width, this.ctx.canvas.height); From 44f6a4a9fef76ccb3d013d30e866b2fe06c73709 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 27 Dec 2025 13:10:16 +0100 Subject: [PATCH 027/162] marked event listener as passive to prevent scroll delay --- src/js/stendhal/Client.ts | 4 ++-- src/js/stendhal/ui/ViewPort.ts | 4 ++-- src/js/stendhal/ui/component/ChatLogComponent.ts | 2 +- src/js/stendhal/ui/component/ItemContainerImplementation.ts | 4 ++-- src/js/stendhal/util/ElementClickListener.ts | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index 6cfb9ecdba..f4ccdae9cd 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -426,12 +426,12 @@ export class Client { gamewindow.addEventListener("dblclick", stendhal.ui.gamewindow.onMouseDown); gamewindow.addEventListener("dragstart", stendhal.ui.gamewindow.onDragStart); gamewindow.addEventListener("mousemove", stendhal.ui.gamewindow.onMouseMove); - gamewindow.addEventListener("touchstart", stendhal.ui.gamewindow.onMouseDown); + gamewindow.addEventListener("touchstart", stendhal.ui.gamewindow.onMouseDown, {passive: true}); gamewindow.addEventListener("touchend", stendhal.ui.gamewindow.onTouchEnd); gamewindow.addEventListener("dragover", stendhal.ui.gamewindow.onDragOver); gamewindow.addEventListener("drop", stendhal.ui.gamewindow.onDrop); gamewindow.addEventListener("contextmenu", stendhal.ui.gamewindow.onContentMenu); - gamewindow.addEventListener("wheel", stendhal.ui.gamewindow.onMouseWheel); + gamewindow.addEventListener("wheel", stendhal.ui.gamewindow.onMouseWheel, {passive: true}); singletons.getJoystickController().registerGlobalEventHandlers(); diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index 1d9650a21d..bd3e3c6134 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -516,9 +516,9 @@ export class ViewPort { stendhal.ui.timestampMouseDown = +new Date(); if (e.type !== "dblclick" && e.target) { - e.target.addEventListener("mousemove", mHandle.onDrag); + e.target.addEventListener("mousemove", mHandle.onDrag, {passive: true}); e.target.addEventListener("mouseup", mHandle.onMouseUp); - e.target.addEventListener("touchmove", mHandle.onDrag); + e.target.addEventListener("touchmove", mHandle.onDrag, {passive: true}); e.target.addEventListener("touchend", mHandle.onMouseUp); } else if (entity == stendhal.zone.ground) { entity.onclick(pos.canvasRelativeX, pos.canvasRelativeY, true); diff --git a/src/js/stendhal/ui/component/ChatLogComponent.ts b/src/js/stendhal/ui/component/ChatLogComponent.ts index d69e6d9640..fbdf9e0735 100644 --- a/src/js/stendhal/ui/component/ChatLogComponent.ts +++ b/src/js/stendhal/ui/component/ChatLogComponent.ts @@ -41,7 +41,7 @@ export class ChatLogComponent extends Component { this.componentElement.addEventListener("touchstart", (evt: TouchEvent) => { const pos = stendhal.ui.html.extractPosition(evt); stendhal.ui.touch.onTouchStart(pos.pageX, pos.pageY); - }); + }, {passive: true}); this.componentElement.addEventListener("touchend", (evt: TouchEvent) => { stendhal.ui.touch.onTouchEnd(); this.onContextMenu(evt) diff --git a/src/js/stendhal/ui/component/ItemContainerImplementation.ts b/src/js/stendhal/ui/component/ItemContainerImplementation.ts index 1d024dc8f8..8cbbed7a8a 100644 --- a/src/js/stendhal/ui/component/ItemContainerImplementation.ts +++ b/src/js/stendhal/ui/component/ItemContainerImplementation.ts @@ -60,7 +60,7 @@ export class ItemContainerImplementation { }); e.addEventListener("touchmove", (event: TouchEvent) => { this.onTouchMove(event); - }); + }, {passive: true}); e.addEventListener("drop", (event: DragEvent) => { this.onDrop(event) }); @@ -72,7 +72,7 @@ export class ItemContainerImplementation { }); e.addEventListener("touchstart", (event: TouchEvent) => { this.onTouchStart(event) - }); + }, {passive: true}); e.addEventListener("touchend", (event: TouchEvent) => { this.onTouchEnd(event) }); diff --git a/src/js/stendhal/util/ElementClickListener.ts b/src/js/stendhal/util/ElementClickListener.ts index a6dc3e7f85..5d444f8770 100644 --- a/src/js/stendhal/util/ElementClickListener.ts +++ b/src/js/stendhal/util/ElementClickListener.ts @@ -39,7 +39,7 @@ export class ElementClickListener { element.addEventListener("touchstart", (evt: TouchEvent) => { evt.preventDefault(); this.touchEngaged = evt.changedTouches.length; - }); + }, {passive: true}); element.addEventListener("mouseup", (evt: MouseEvent) => { evt.preventDefault(); if (this.clickEngaged && evt.button == 0 && this.onClick) { From d9b51f0d155ccd41712da7322751ec2335675c63 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 28 Dec 2025 10:04:14 +0100 Subject: [PATCH 028/162] disabled code to draw lights (alpha is broken) --- .../landscape/CombinedTilesetImageLoader.ts | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index 05292b3492..a042e2a91d 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2022-2023 - Faiumoni e. V. * + * (C) Copyright 2022-2025 - Faiumoni e. V. * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -58,6 +58,9 @@ export class CombinedTilesetImageLoader { } const tsname = this.map.tilesetFilenames[tileset]; + if (!tsname) { + return; + } img.src = tsname + "?v=" + stendhal.data.build.version; if (this.landscapeAnimationMap) { @@ -113,8 +116,35 @@ export class CombinedTilesetImageLoader { let base = this.map.firstgids[tileset]; let tileIndexInTileset = gid - base; this.drawTile(pixelX, pixelY, image, tileIndexInTileset, flip); - } + + /* + if (stendhal.ui.gamewindow.HSLFilter) { + this.combinedTileset.ctx.globalCompositeOperation = "multiply"; + this.combinedTileset.ctx.fillStyle = stendhal.ui.gamewindow.HSLFilter; + this.combinedTileset.ctx.fillRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); + + let tile = tiles[0]; + this.combinedTileset.ctx.globalCompositeOperation = "soft-light"; + if (tile > 0) { + let flip = tile & 0xE0000000; + let gid = tile & 0x1FFFFFFF; + let tileset = this.map.getTilesetForGid(gid); + let image = this.tilesetImages[tileset]; + if (image && image.height) { + let base = this.map.firstgids[tileset]; + let tileIndexInTileset = gid - base; + this.drawTile(pixelX, pixelY, image, tileIndexInTileset, flip); + } + } else { + this.combinedTileset.ctx.fillStyle = "black"; + this.combinedTileset.ctx.fillRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); + } + + this.combinedTileset.ctx.globalCompositeOperation = "source-over"; + // document.getElementsByTagName("body")[0].append(this.tempCanvas); + } + */ } private drawTile(pixelX: number, pixelY: number, tilesetImage: HTMLImageElement, tileIndexInTileset: number, flip: number) { From d191c14232ec5efbdf9fcd79841dd277f59b808e Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 28 Dec 2025 12:31:20 +0100 Subject: [PATCH 029/162] updated typescript and typedoc --- package-lock.json | 268 +++++++++++++++++++++++++++++++++++++++++++--- package.json | 4 +- 2 files changed, 258 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 32126ed830..bf69eee3f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,21 +1,249 @@ { "name": "stendhal", "version": "1.0.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "stendhal", "version": "1.0.0", "license": "AGPL-3.0-or-later", + "devDependencies": { + "showdown": "^2.1.0", + "typedoc": "^0.28.15", + "typescript": "^5.9.3" + } + }, + "node_modules/@gerrit0/mini-shiki": { + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-3.20.0.tgz", + "integrity": "sha512-Wa57i+bMpK6PGJZ1f2myxo3iO+K/kZikcyvH8NIqNNZhQUbDav7V9LQmWOXhf946mz5c1NZ19WMsGYiDKTryzQ==", + "dev": true, + "license": "MIT", "dependencies": { - "typescript": "^5.1.0" + "@shikijs/engine-oniguruma": "^3.20.0", + "@shikijs/langs": "^3.20.0", + "@shikijs/themes": "^3.20.0", + "@shikijs/types": "^3.20.0", + "@shikijs/vscode-textmate": "^10.0.2" + } + }, + "node_modules/@shikijs/engine-oniguruma": { + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.20.0.tgz", + "integrity": "sha512-Yx3gy7xLzM0ZOjqoxciHjA7dAt5tyzJE3L4uQoM83agahy+PlW244XJSrmJRSBvGYELDhYXPacD4R/cauV5bzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.20.0", + "@shikijs/vscode-textmate": "^10.0.2" + } + }, + "node_modules/@shikijs/langs": { + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.20.0.tgz", + "integrity": "sha512-le+bssCxcSHrygCWuOrYJHvjus6zhQ2K7q/0mgjiffRbkhM4o1EWu2m+29l0yEsHDbWaWPNnDUTRVVBvBBeKaA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.20.0" + } + }, + "node_modules/@shikijs/themes": { + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.20.0.tgz", + "integrity": "sha512-U1NSU7Sl26Q7ErRvJUouArxfM2euWqq1xaSrbqMu2iqa+tSp0D1Yah8216sDYbdDHw4C8b75UpE65eWorm2erQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.20.0" + } + }, + "node_modules/@shikijs/types": { + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.20.0.tgz", + "integrity": "sha512-lhYAATn10nkZcBQ0BlzSbJA3wcmL5MXUUF8d2Zzon6saZDlToKaiRX60n2+ZaHJCmXEcZRWNzn+k9vplr8Jhsw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/vscode-textmate": "^10.0.2", + "@types/hast": "^3.0.4" + } + }, + "node_modules/@shikijs/vscode-textmate": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz", + "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/hast": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz", + "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/@types/unist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/commander": { + "version": "9.5.0", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || >=14" + } + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/linkify-it": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "uc.micro": "^2.0.0" + } + }, + "node_modules/lunr": { + "version": "2.3.9", + "dev": true, + "license": "MIT" + }, + "node_modules/markdown-it": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", + "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1", + "entities": "^4.4.0", + "linkify-it": "^5.0.0", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.1.0" + }, + "bin": { + "markdown-it": "bin/markdown-it.mjs" + } + }, + "node_modules/mdurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", + "dev": true, + "license": "MIT" + }, + "node_modules/minimatch": { + "version": "9.0.5", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/punycode.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", + "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/showdown": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "commander": "^9.0.0" + }, + "bin": { + "showdown": "bin/showdown.js" + }, + "funding": { + "type": "individual", + "url": "https://www.paypal.me/tiviesantos" + } + }, + "node_modules/typedoc": { + "version": "0.28.15", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.28.15.tgz", + "integrity": "sha512-mw2/2vTL7MlT+BVo43lOsufkkd2CJO4zeOSuWQQsiXoV2VuEn7f6IZp2jsUDPmBMABpgR0R5jlcJ2OGEFYmkyg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@gerrit0/mini-shiki": "^3.17.0", + "lunr": "^2.3.9", + "markdown-it": "^14.1.0", + "minimatch": "^9.0.5", + "yaml": "^2.8.1" + }, + "bin": { + "typedoc": "bin/typedoc" + }, + "engines": { + "node": ">= 18", + "pnpm": ">= 10" + }, + "peerDependencies": { + "typescript": "5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x || 5.9.x" } }, "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -23,13 +251,29 @@ "engines": { "node": ">=14.17" } - } - }, - "dependencies": { - "typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==" + }, + "node_modules/uc.micro": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", + "dev": true, + "license": "MIT" + }, + "node_modules/yaml": { + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz", + "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==", + "dev": true, + "license": "ISC", + "bin": { + "yaml": "bin.mjs" + }, + "engines": { + "node": ">= 14.6" + }, + "funding": { + "url": "https://github.com/sponsors/eemeli" + } } } } diff --git a/package.json b/package.json index 6619d1b7a2..6585e78162 100644 --- a/package.json +++ b/package.json @@ -29,10 +29,10 @@ "homepage": "https://arianne-project.org", "private": true, "dependencies": { - "typescript": "^5.2.0" }, "devDependencies": { "showdown": "^2.1.0", - "typedoc": "^0.25.12" + "typedoc": "^0.28.15", + "typescript": "^5.9.3" } } From 063d03c45f8204d2ed8bd6fa171547759b5c3c58 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 28 Dec 2025 12:32:20 +0100 Subject: [PATCH 030/162] used Canvas and RenderingContext2D to allow OffscreenCanvas --- src/js/stendhal/action/ScreenCaptureAction.ts | 1 + src/js/stendhal/data/SpriteStore.ts | 4 +- src/js/stendhal/entity/Blood.ts | 3 +- src/js/stendhal/entity/Corpse.ts | 3 +- src/js/stendhal/entity/DomesticAnimal.ts | 3 +- src/js/stendhal/entity/Door.ts | 4 +- src/js/stendhal/entity/Entity.ts | 7 ++-- src/js/stendhal/entity/Food.ts | 3 +- src/js/stendhal/entity/Gate.ts | 3 +- .../stendhal/entity/GrowingEntitySpawner.ts | 3 +- src/js/stendhal/entity/Item.ts | 8 +++- src/js/stendhal/entity/NPC.ts | 3 +- src/js/stendhal/entity/Player.ts | 3 +- src/js/stendhal/entity/PopupInventory.ts | 3 +- src/js/stendhal/entity/RPEntity.ts | 38 ++++++++++--------- src/js/stendhal/entity/Sign.ts | 3 +- src/js/stendhal/event/ViewChangeEvent.ts | 5 ++- src/js/stendhal/landscape/CombinedTileset.ts | 6 ++- .../IndividualTilesetRenderingStrategy.ts | 9 +++-- .../stendhal/landscape/LandscapeRenderer.ts | 5 ++- .../landscape/LandscapeRenderingStrategy.ts | 5 ++- .../stendhal/landscape/ParallaxBackground.ts | 3 +- src/js/stendhal/sprite/AchievementBanner.ts | 8 ++-- .../sprite/ActivityIndicatorSprite.ts | 3 +- src/js/stendhal/sprite/EmojiSprite.ts | 3 +- src/js/stendhal/sprite/EmptySprite.ts | 7 ++-- src/js/stendhal/sprite/Floater.ts | 3 +- src/js/stendhal/sprite/ImageSprite.ts | 9 +++-- src/js/stendhal/sprite/NotificationBubble.ts | 3 +- src/js/stendhal/sprite/OverlaySpriteImpl.ts | 6 ++- src/js/stendhal/sprite/SpeechBubble.ts | 3 +- src/js/stendhal/sprite/Sprite.ts | 6 ++- src/js/stendhal/sprite/TextBubble.ts | 11 +++++- src/js/stendhal/sprite/TextSprite.ts | 6 ++- src/js/stendhal/sprite/action/AttackSprite.ts | 3 +- .../sprite/action/BarehandAttackSprite.ts | 3 +- .../sprite/action/DirectionalSkillEffect.ts | 3 +- .../sprite/action/MeleeAttackSprite.ts | 3 +- .../sprite/action/RangedAttackSprite.ts | 3 +- src/js/stendhal/sprite/action/SkillEffect.ts | 7 ++-- src/js/stendhal/ui/HTMLManager.ts | 2 - src/js/stendhal/ui/ViewPort.ts | 7 ++-- .../stendhal/ui/component/MiniMapComponent.ts | 7 ++-- .../ui/component/OutfitPreviewComponent.ts | 3 +- .../stendhal/ui/component/StatBarComponent.ts | 5 ++- .../ui/dialog/outfit/OutfitColorSelector.ts | 8 ++-- .../ui/dialog/outfit/OutfitPartSelector.ts | 4 +- src/js/stendhal/util/BackgroundPainter.ts | 4 +- src/js/stendhal/util/DownloadUtil.ts | 4 +- src/js/stendhal/util/DrawingStage.ts | 5 ++- src/js/stendhal/util/ScreenCapture.ts | 2 +- src/js/stendhal/util/Speech.ts | 6 ++- src/js/stendhal/util/Types.ts | 2 + src/js/stendhal/util/WeatherRenderer.ts | 17 +++++---- 54 files changed, 180 insertions(+), 111 deletions(-) create mode 100644 src/js/stendhal/util/Types.ts diff --git a/src/js/stendhal/action/ScreenCaptureAction.ts b/src/js/stendhal/action/ScreenCaptureAction.ts index 7c8fc9d3c2..539e89a486 100644 --- a/src/js/stendhal/action/ScreenCaptureAction.ts +++ b/src/js/stendhal/action/ScreenCaptureAction.ts @@ -13,6 +13,7 @@ import { SlashAction } from "./SlashAction"; import { ScreenCapture } from "../util/ScreenCapture"; +import { Canvas } from "util/Types"; declare var stendhal: any; diff --git a/src/js/stendhal/data/SpriteStore.ts b/src/js/stendhal/data/SpriteStore.ts index ad165fca12..2f260c89b4 100644 --- a/src/js/stendhal/data/SpriteStore.ts +++ b/src/js/stendhal/data/SpriteStore.ts @@ -11,6 +11,7 @@ declare var stendhal: any; +import { Canvas } from "util/Types"; import { Paths } from "./Paths"; @@ -135,7 +136,7 @@ export class SpriteStore { * Angle of rotation. */ private rotate(img: HTMLImageElement, angle: number) { - const canvas = document.getElementById("drawing-stage")!; + const canvas = document.getElementById("drawing-stage")! as HTMLCanvasElement; const ctx = canvas.getContext("2d")!; // make sure working with blank canvas ctx.clearRect(0, 0, canvas.width, canvas.height); @@ -291,6 +292,7 @@ export class SpriteStore { ctx.drawImage(image, offsetX, offsetY, width, height, 0, 0, width, height); // Firefox would be able to use the canvas directly as a drag image, but // Chrome does not. This should work in any standards compliant browser. + // TODO: Check if that is still true var newImage = new Image(); newImage.src = canvas.toDataURL("image/png"); return newImage; diff --git a/src/js/stendhal/entity/Blood.ts b/src/js/stendhal/entity/Blood.ts index 680b8a26c5..c94abc0ea3 100644 --- a/src/js/stendhal/entity/Blood.ts +++ b/src/js/stendhal/entity/Blood.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; declare var stendhal: any; @@ -40,7 +41,7 @@ export class Blood extends Entity { return "url(" + stendhal.paths.sprites + "/cursor/walk.png) 1 3, auto"; } - override drawSpriteAt(ctx: CanvasRenderingContext2D, x: number, y: number) { + override drawSpriteAt(ctx: RenderingContext2D, x: number, y: number) { if (!stendhal.config.getBoolean("effect.blood")) { return; } diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index 16ccd30caa..40cd34db9e 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { ActivityIndicatorSprite } from "../sprite/ActivityIndicatorSprite"; import { ItemInventoryComponent } from "../ui/component/ItemInventoryComponent"; @@ -50,7 +51,7 @@ export class Corpse extends PopupInventory { } } - override draw(ctx: CanvasRenderingContext2D) { + override draw(ctx: RenderingContext2D) { if (!this.sprite) { return; } diff --git a/src/js/stendhal/entity/DomesticAnimal.ts b/src/js/stendhal/entity/DomesticAnimal.ts index 137bdc52fe..0ffbd015d9 100644 --- a/src/js/stendhal/entity/DomesticAnimal.ts +++ b/src/js/stendhal/entity/DomesticAnimal.ts @@ -13,6 +13,7 @@ import { RPEntity } from "./RPEntity"; import { MenuItem} from "../action/MenuItem"; import { Color } from "../data/color/Color"; +import { RenderingContext2D } from "util/Types"; declare var marauroa: any; declare var stendhal: any; @@ -21,7 +22,7 @@ export class DomesticAnimal extends RPEntity { override minimapStyle = Color.DOMESTICANIMAL; - override drawMain(ctx: CanvasRenderingContext2D) { + override drawMain(ctx: RenderingContext2D) { if (!this.imagePath && this["_rpclass"]) { this["largeWeight"] = this["largeWeight"] | 20; if (this["_rpclass"] == "sheep") { diff --git a/src/js/stendhal/entity/Door.ts b/src/js/stendhal/entity/Door.ts index 3258d3aa41..78cf9cdfc3 100644 --- a/src/js/stendhal/entity/Door.ts +++ b/src/js/stendhal/entity/Door.ts @@ -9,17 +9,17 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Portal } from "./Portal"; -declare var marauroa: any; declare var stendhal: any; export class Door extends Portal { override zIndex = 5000; - override draw(ctx: CanvasRenderingContext2D) { + override draw(ctx: RenderingContext2D) { let imagePath = stendhal.paths.sprites + "/doors/" + this["class"] + ".png"; let image = stendhal.data.sprites.get(imagePath); if (image.height) { diff --git a/src/js/stendhal/entity/Entity.ts b/src/js/stendhal/entity/Entity.ts index ee52a43a29..659a191146 100644 --- a/src/js/stendhal/entity/Entity.ts +++ b/src/js/stendhal/entity/Entity.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Chat } from "../util/Chat"; import { RPObject } from "./RPObject"; @@ -204,7 +205,7 @@ export class Entity extends RPObject { this["_x"] = this["x"]; } - draw(ctx: CanvasRenderingContext2D) { + draw(ctx: RenderingContext2D) { if (this.sprite) { this.drawSprite(ctx); } @@ -213,11 +214,11 @@ export class Entity extends RPObject { /** * draws a standard sprite */ - drawSprite(ctx: CanvasRenderingContext2D) { + drawSprite(ctx: RenderingContext2D) { this.drawSpriteAt(ctx, this["x"] * 32, this["y"] * 32); } - drawSpriteAt(ctx: CanvasRenderingContext2D, x: number, y: number) { + drawSpriteAt(ctx: RenderingContext2D, x: number, y: number) { var image = stendhal.data.sprites.get(this.sprite.filename); if (image.height) { var offsetX = this.sprite.offsetX || 0; diff --git a/src/js/stendhal/entity/Food.ts b/src/js/stendhal/entity/Food.ts index 31effe663c..9927d1a5e2 100644 --- a/src/js/stendhal/entity/Food.ts +++ b/src/js/stendhal/entity/Food.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; declare var marauroa: any; @@ -27,7 +28,7 @@ export class Food extends Entity { // TODO: play sound effect } - override draw(ctx: CanvasRenderingContext2D) { + override draw(ctx: RenderingContext2D) { var image = stendhal.data.sprites.get(stendhal.paths.sprites + "/food.png"); if (image.height) { var localX = this["x"] * 32; diff --git a/src/js/stendhal/entity/Gate.ts b/src/js/stendhal/entity/Gate.ts index 881e9659e5..c40d22eddc 100644 --- a/src/js/stendhal/entity/Gate.ts +++ b/src/js/stendhal/entity/Gate.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Entity } from "./Entity"; @@ -44,7 +45,7 @@ export class Gate extends Entity { }); } - override draw(ctx: CanvasRenderingContext2D) { + override draw(ctx: RenderingContext2D) { if (this._image == undefined) { var filename = stendhal.paths.sprites + "/doors/" + this["image"] + "_" + this["orientation"] + ".png"; this._image = stendhal.data.sprites.get(filename); diff --git a/src/js/stendhal/entity/GrowingEntitySpawner.ts b/src/js/stendhal/entity/GrowingEntitySpawner.ts index 3aa64e390a..ef78f70751 100644 --- a/src/js/stendhal/entity/GrowingEntitySpawner.ts +++ b/src/js/stendhal/entity/GrowingEntitySpawner.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Entity } from "./Entity"; @@ -51,7 +52,7 @@ export class GrowingEntitySpawner extends Entity { /** * draw RPEntities */ - override draw(ctx: CanvasRenderingContext2D) { + override draw(ctx: RenderingContext2D) { var localX = this["x"] * 32; var localY = this["y"] * 32; diff --git a/src/js/stendhal/entity/Item.ts b/src/js/stendhal/entity/Item.ts index 791bc533db..f33f920bb6 100644 --- a/src/js/stendhal/entity/Item.ts +++ b/src/js/stendhal/entity/Item.ts @@ -13,6 +13,7 @@ import { ItemMap } from "./ItemMap"; import { MenuItem } from "../action/MenuItem"; import { Entity } from "./Entity"; import { TextSprite } from "../sprite/TextSprite"; +import { RenderingContext2D } from "util/Types"; declare var marauroa: any; declare var stendhal: any; @@ -80,17 +81,20 @@ export class Item extends Entity { } } - override draw(ctx: CanvasRenderingContext2D) { + override draw(ctx: RenderingContext2D) { this.sprite.offsetY = (this["state"] || 0) * 32 this.stepAnimation(); this.drawAt(ctx, this["x"] * 32, this["y"] * 32); } - drawAt(ctx: CanvasRenderingContext2D, x: number, y: number) { + drawAt(ctx: RenderingContext2D, x: number, y: number) { if (this.sprite) { this.drawSpriteAt(ctx, x, y); let textMetrics = this.quantityTextSprite.getTextMetrics(ctx); + if (!textMetrics) { + throw new Error("textMetrics is undefined"); + } this.quantityTextSprite.draw(ctx, x + (32 - textMetrics.width), y + 6); } } diff --git a/src/js/stendhal/entity/NPC.ts b/src/js/stendhal/entity/NPC.ts index ee9d8ed438..26071a2b0c 100644 --- a/src/js/stendhal/entity/NPC.ts +++ b/src/js/stendhal/entity/NPC.ts @@ -14,6 +14,7 @@ import { RPEntity } from "./RPEntity"; import { EntityOverlayRegistry } from "../data/EntityOverlayRegistry"; import { Color } from "../data/color/Color"; +import { RenderingContext2D } from "util/Types"; declare var stendhal: any; @@ -42,7 +43,7 @@ export class NPC extends RPEntity { } } - override drawTop(ctx: CanvasRenderingContext2D) { + override drawTop(ctx: RenderingContext2D) { var localX = this["_x"] * 32; var localY = this["_y"] * 32; if (typeof(this["no_hpbar"]) == "undefined") { diff --git a/src/js/stendhal/entity/Player.ts b/src/js/stendhal/entity/Player.ts index 2a07d86520..d600bf3e36 100644 --- a/src/js/stendhal/entity/Player.ts +++ b/src/js/stendhal/entity/Player.ts @@ -22,6 +22,7 @@ import { UIComponentEnum } from "../ui/UIComponentEnum"; import { GroupPanelComponent } from "../ui/component/GroupPanelComponent"; import { Color } from "../data/color/Color"; +import { RenderingContext2D } from "util/Types"; export class Player extends RPEntity { @@ -169,7 +170,7 @@ export class Player extends RPEntity { } } - override draw(ctx: CanvasRenderingContext2D) { + override draw(ctx: RenderingContext2D) { if (this.isIgnored()) { return; } diff --git a/src/js/stendhal/entity/PopupInventory.ts b/src/js/stendhal/entity/PopupInventory.ts index fb995da53e..ab51130afd 100644 --- a/src/js/stendhal/entity/PopupInventory.ts +++ b/src/js/stendhal/entity/PopupInventory.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; import { RPObject } from "./RPObject"; @@ -20,7 +21,7 @@ export class PopupInventory extends Entity { protected maxDistToView = 4; - override draw(ctx: CanvasRenderingContext2D) { + override draw(ctx: RenderingContext2D) { super.draw(ctx); if (this.inventory && this.inventory.isOpen() && !this.canViewContents()) { // player has moved too far away diff --git a/src/js/stendhal/entity/RPEntity.ts b/src/js/stendhal/entity/RPEntity.ts index e49c6789a7..d20881020f 100644 --- a/src/js/stendhal/entity/RPEntity.ts +++ b/src/js/stendhal/entity/RPEntity.ts @@ -33,6 +33,7 @@ import { BarehandAttackSprite } from "../sprite/action/BarehandAttackSprite"; import { RangedAttackSprite } from "../sprite/action/RangedAttackSprite"; import { ImageWithDimensions } from "data/ImageWithDimensions"; +import { RenderingContext2D } from "util/Types"; var HEALTH_BAR_HEIGHT = 6; @@ -54,7 +55,7 @@ export class RPEntity extends ActiveEntity { // for adjusting entity hp bar & title vertical position protected titleDrawYOffset: number = 0; // canvas for merging outfit layers to be drawn - private octx?: CanvasRenderingContext2D; + private octx?: RenderingContext2D; private attackers: {[key: string]: any} = { size: 0 }; @@ -218,7 +219,7 @@ export class RPEntity extends ActiveEntity { return typeof(this["no_shadow"]) === "undefined"; } - drawMultipartOutfit(ctx: CanvasRenderingContext2D) { + drawMultipartOutfit(ctx: RenderingContext2D) { const store = singletons.getOutfitStore(); // layers in draw order var layers = store.getLayerNames(); @@ -347,7 +348,7 @@ export class RPEntity extends ActiveEntity { /** * draw RPEntities */ - override draw(ctx: CanvasRenderingContext2D) { + override draw(ctx: RenderingContext2D) { if (typeof(this["ghostmode"]) != "undefined" && marauroa.me && !marauroa.me.isAdmin()) { return; } @@ -357,7 +358,7 @@ export class RPEntity extends ActiveEntity { this.drawStatusIcons(ctx); } - drawMain(ctx: CanvasRenderingContext2D) { + drawMain(ctx: RenderingContext2D) { if (typeof(this["outfit"]) != "undefined" || typeof(this["outfit_ext"]) != "undefined") { this.drawMultipartOutfit(ctx); } else { @@ -396,7 +397,7 @@ export class RPEntity extends ActiveEntity { } } - drawStatusIcons(ctx: CanvasRenderingContext2D) { + drawStatusIcons(ctx: RenderingContext2D) { function _drawAnimatedIcon(icon: CanvasImageSource, delay: number, nFrames: number, xdim: number, ydim: number, x: number, y: number) { var frame = Math.floor(Date.now() / delay) % nFrames; @@ -474,11 +475,11 @@ export class RPEntity extends ActiveEntity { * Draw colored ellipses (or rectangles on browsers that do not support * ellipses) when the entity is being attacked, or is attacking the user. */ - drawCombat(ctx: CanvasRenderingContext2D) { + drawCombat(ctx: RenderingContext2D) { if (this.attackers.size > 0) { ctx.lineWidth = 1; /* - * As of 2015-9-15 CanvasRenderingContext2D.ellipse() is not + * As of 2015-9-15 RenderingContext2D.ellipse() is not * supported in most browsers. Fall back to rectangles on these. * Also on Chrome 45.0.2454.85 ellipse() does not seem to support * the begin angle parameter correctly, nor does the stroke @@ -539,7 +540,7 @@ export class RPEntity extends ActiveEntity { * the coordinates where to start floating. The method should return true * when the floater should be removed. */ - drawFloaters(ctx: CanvasRenderingContext2D) { + drawFloaters(ctx: RenderingContext2D) { var centerX = (this["_x"] + this["width"] / 2) * 32; var topY = (this["_y"] + 1) * 32 - this["drawHeight"]; // Grab an unchanging copy @@ -555,10 +556,10 @@ export class RPEntity extends ActiveEntity { } /** - * @param {CanvasRenderingContext2D} ctx + * @param {RenderingContext2D} ctx * @param {Image} image */ - drawSpriteImage(ctx: CanvasRenderingContext2D, image: CanvasImageSource & ImageWithDimensions) { + drawSpriteImage(ctx: RenderingContext2D, image: CanvasImageSource & ImageWithDimensions) { var localX = this["_x"] * 32; var localY = this["_y"] * 32; if (image.height) { // image.complete is true on missing image files @@ -610,7 +611,7 @@ export class RPEntity extends ActiveEntity { } } - drawTop(ctx: CanvasRenderingContext2D) { + drawTop(ctx: RenderingContext2D) { var localX = this["_x"] * 32; var localY = this["_y"] * 32; this.drawFloaters(ctx); @@ -618,7 +619,7 @@ export class RPEntity extends ActiveEntity { this.drawTitle(ctx, localX, localY + this.statusBarYOffset); } - drawHealthBar(ctx: CanvasRenderingContext2D, x: number, y: number) { + drawHealthBar(ctx: RenderingContext2D, x: number, y: number) { var drawX = x + ((this["width"] * 32) - this["drawWidth"]) / 2; var drawY = y + (this["height"] * 32) - this["drawHeight"] - HEALTH_BAR_HEIGHT + this.titleDrawYOffset; @@ -655,16 +656,19 @@ export class RPEntity extends ActiveEntity { } } - drawTitle(ctx: CanvasRenderingContext2D, x: number, y: number) { + drawTitle(ctx: RenderingContext2D, x: number, y: number) { if (this.titleTextSprite) { let textMetrics = this.titleTextSprite.getTextMetrics(ctx); + if (!textMetrics) { + throw new Error("textMetrics is undefined"); + } var drawY = y + (this["height"] * 32) - this["drawHeight"] - HEALTH_BAR_HEIGHT + this.titleDrawYOffset; this.titleTextSprite.draw(ctx, x + (this["width"] * 32 - textMetrics.width) / 2, drawY - 5 - HEALTH_BAR_HEIGHT); } } - drawAttack(ctx: CanvasRenderingContext2D) { + drawAttack(ctx: RenderingContext2D) { if (!this.attackSprite) { return; } @@ -684,10 +688,10 @@ export class RPEntity extends ActiveEntity { /** * Draws an animation over entity sprite. * - * @param {CanvasRenderingContext2D} ctx + * @param {RenderingContext2D} ctx * Canvas context to draw on. */ - private drawOverlayAnimation(ctx: CanvasRenderingContext2D) { + private drawOverlayAnimation(ctx: RenderingContext2D) { if (this.overlay && this.overlay.draw(ctx, this["drawOffsetX"], this["drawOffsetY"], this["drawWidth"], this["drawHeight"])) { // overlay sprite expired @@ -780,7 +784,7 @@ export class RPEntity extends ActiveEntity { return { initTime: Date.now(), image: stendhal.data.sprites.get(imagePath), - draw: function(ctx: CanvasRenderingContext2D, x: number, y: number) { + draw: function(ctx: RenderingContext2D, x: number, y: number) { ctx.drawImage(this.image, x, y); return (Date.now() - this.initTime > 1200); } diff --git a/src/js/stendhal/entity/Sign.ts b/src/js/stendhal/entity/Sign.ts index 512c2c0f07..03debd3039 100644 --- a/src/js/stendhal/entity/Sign.ts +++ b/src/js/stendhal/entity/Sign.ts @@ -11,6 +11,7 @@ import { Entity } from "./Entity"; import { ActivityIndicatorSprite } from "../sprite/ActivityIndicatorSprite"; +import { RenderingContext2D } from "util/Types"; declare var stendhal: any; @@ -32,7 +33,7 @@ export class Sign extends Entity { } } - override draw(ctx: CanvasRenderingContext2D) { + override draw(ctx: RenderingContext2D) { if (!this.imagePath) { this.imagePath = stendhal.paths.sprites + "/signs/" + this["class"] + ".png"; } diff --git a/src/js/stendhal/event/ViewChangeEvent.ts b/src/js/stendhal/event/ViewChangeEvent.ts index f86330fd4b..022111416e 100644 --- a/src/js/stendhal/event/ViewChangeEvent.ts +++ b/src/js/stendhal/event/ViewChangeEvent.ts @@ -12,6 +12,7 @@ declare var stendhal: any; +import { Canvas } from "util/Types"; import { RPEvent } from "./RPEvent"; @@ -24,8 +25,8 @@ export class ViewChangeEvent extends RPEvent { public y!: number; - execute(entity: any) { - const canvas = stendhal.ui.viewport.getElement() as HTMLCanvasElement; + execute(_entity: any) { + const canvas = stendhal.ui.viewport.getElement() as Canvas; queueMicrotask(() => { stendhal.ui.viewport.freeze = true; stendhal.ui.viewport.offsetX = this.x * stendhal.ui.viewport.targetTileWidth diff --git a/src/js/stendhal/landscape/CombinedTileset.ts b/src/js/stendhal/landscape/CombinedTileset.ts index 2731927447..9e4f45e564 100644 --- a/src/js/stendhal/landscape/CombinedTileset.ts +++ b/src/js/stendhal/landscape/CombinedTileset.ts @@ -9,6 +9,8 @@ * * ***************************************************************************/ +import { Canvas, RenderingContext2D } from "util/Types"; + declare var stendhal: any; /** @@ -21,8 +23,8 @@ declare var stendhal: any; * We use one large tileset for the combined tiles in order to be compatible with WebGL. */ export class CombinedTileset { - public readonly canvas: HTMLCanvasElement; - public readonly ctx: CanvasRenderingContext2D; + public readonly canvas: Canvas; + public readonly ctx: RenderingContext2D; public readonly tilesPerRow: number; constructor(numberOfTiles: number, public readonly combinedLayers: number[][]) { diff --git a/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts b/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts index ef1f4a9e3c..0920d981d1 100644 --- a/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts +++ b/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts @@ -15,6 +15,7 @@ import { LandscapeRenderingStrategy } from "./LandscapeRenderingStrategy"; import { ImagePreloader } from "../data/ImagePreloader"; import { Chat } from "../util/Chat"; import { TileMap } from "../data/TileMap"; +import { Canvas, RenderingContext2D } from "util/Types"; export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrategy { @@ -42,7 +43,7 @@ export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrate } public render( - canvas: HTMLCanvasElement, gamewindow: any, + canvas: Canvas, gamewindow: any, tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void { this.targetTileWidth = targetTileWidth; @@ -60,12 +61,12 @@ export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrate } } - private paintLayer(canvas: HTMLCanvasElement, drawingLayer: number, + private paintLayer(canvas: Canvas, drawingLayer: number, tileOffsetX: number, tileOffsetY: number) { const layer = stendhal.data.map.layers[drawingLayer]; const yMax = Math.min(tileOffsetY + canvas.height / this.targetTileHeight + 1, stendhal.data.map.zoneSizeY); const xMax = Math.min(tileOffsetX + canvas.width / this.targetTileWidth + 1, stendhal.data.map.zoneSizeX); - let ctx = canvas.getContext("2d")!; + let ctx = canvas.getContext("2d")! as RenderingContext2D; for (let y = tileOffsetY; y < yMax; y++) { for (let x = tileOffsetX; x < xMax; x++) { @@ -90,7 +91,7 @@ export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrate } } - private drawTile(ctx: CanvasRenderingContext2D, tileset: HTMLImageElement, idx: number, x: number, y: number, flip = 0) { + private drawTile(ctx: RenderingContext2D, tileset: HTMLImageElement, idx: number, x: number, y: number, flip = 0) { const tilesetWidth = tileset.width; const tilesPerRow = Math.floor(tilesetWidth / stendhal.data.map.tileWidth); const pixelX = x * this.targetTileWidth; diff --git a/src/js/stendhal/landscape/LandscapeRenderer.ts b/src/js/stendhal/landscape/LandscapeRenderer.ts index be00690247..135b2bb6f5 100644 --- a/src/js/stendhal/landscape/LandscapeRenderer.ts +++ b/src/js/stendhal/landscape/LandscapeRenderer.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { Canvas, RenderingContext2D } from "util/Types"; import { CombinedTileset } from "./CombinedTileset"; declare var stendhal: any; @@ -16,13 +17,13 @@ declare var stendhal: any; export class LandscapeRenderer { drawLayer( - canvas: HTMLCanvasElement, + canvas: Canvas, combinedTileset: CombinedTileset, layerNo: number, tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void { if (!combinedTileset) { return; } - let ctx = canvas.getContext("2d")!; + let ctx = canvas.getContext("2d")! as RenderingContext2D; const layer = combinedTileset.combinedLayers[layerNo]; const yMax = Math.min(tileOffsetY + canvas.height / targetTileHeight + 1, stendhal.data.map.zoneSizeY); diff --git a/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts b/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts index 83a81281b9..7ca2156637 100644 --- a/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts +++ b/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { Canvas } from "util/Types"; import { TileMap } from "../data/TileMap"; import { CombinedTilesetFactory } from "./CombinedTilesetFactory"; import { LandscapeRenderer } from "./LandscapeRenderer"; @@ -23,7 +24,7 @@ export abstract class LandscapeRenderingStrategy { public abstract onTilesetLoaded(): void; public abstract render( - canvas: HTMLCanvasElement, gamewindow: any, + canvas: Canvas, gamewindow: any, tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void; } @@ -41,7 +42,7 @@ export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy } public render( - canvas: HTMLCanvasElement, gamewindow: any, + canvas: Canvas, gamewindow: any, tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void { let landscapeRenderder = new LandscapeRenderer(); diff --git a/src/js/stendhal/landscape/ParallaxBackground.ts b/src/js/stendhal/landscape/ParallaxBackground.ts index f32472d943..214113f092 100644 --- a/src/js/stendhal/landscape/ParallaxBackground.ts +++ b/src/js/stendhal/landscape/ParallaxBackground.ts @@ -10,6 +10,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { singletons } from "../SingletonRepo"; @@ -75,7 +76,7 @@ export class ParallaxBackground { this.image = undefined; } - draw(ctx: CanvasRenderingContext2D, offsetX: number, offsetY: number) { + draw(ctx: RenderingContext2D, offsetX: number, offsetY: number) { if (!this.image || !this.image.height) { return; } diff --git a/src/js/stendhal/sprite/AchievementBanner.ts b/src/js/stendhal/sprite/AchievementBanner.ts index 3ba28b0d5c..5b5a8511da 100644 --- a/src/js/stendhal/sprite/AchievementBanner.ts +++ b/src/js/stendhal/sprite/AchievementBanner.ts @@ -11,6 +11,7 @@ import { TextBubble } from "./TextBubble"; import { BackgroundPainter } from "../util/BackgroundPainter"; +import { RenderingContext2D } from "util/Types"; declare const stendhal: any; @@ -42,8 +43,7 @@ export class AchievementBanner extends TextBubble { */ this.duration = TextBubble.STANDARD_DUR * 4; - const gamewindow = - document.getElementById("viewport")!; + const gamewindow = document.getElementById("viewport")! as HTMLCanvasElement; const td = this.getTextDimensions(gamewindow.getContext("2d")!); this.innerWidth = td.width + this.padding; // add padding between icon & text @@ -55,7 +55,7 @@ export class AchievementBanner extends TextBubble { this.y = gamewindow.height - this.height; } - override draw(ctx: CanvasRenderingContext2D): boolean { + override draw(ctx: RenderingContext2D): boolean { const targetX = stendhal.ui.gamewindow.offsetX + this.x; const targetY = stendhal.ui.gamewindow.offsetY + this.y; @@ -81,7 +81,7 @@ export class AchievementBanner extends TextBubble { return this.expired(); } - private getTextDimensions(ctx: CanvasRenderingContext2D): any { + private getTextDimensions(ctx: RenderingContext2D): any { const ret = {} as any; ctx.font = this.font; let m = ctx.measureText(this.text); diff --git a/src/js/stendhal/sprite/ActivityIndicatorSprite.ts b/src/js/stendhal/sprite/ActivityIndicatorSprite.ts index 02ac50813b..14972fb703 100644 --- a/src/js/stendhal/sprite/ActivityIndicatorSprite.ts +++ b/src/js/stendhal/sprite/ActivityIndicatorSprite.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; declare var stendhal: any; @@ -42,7 +43,7 @@ export class ActivityIndicatorSprite { * @param width * Pixel width of parent object. */ - public draw(ctx: CanvasRenderingContext2D, dx: number, dy: number, width: number) { + public draw(ctx: RenderingContext2D, dx: number, dy: number, width: number) { if (!ActivityIndicatorSprite.img.complete) { return; } diff --git a/src/js/stendhal/sprite/EmojiSprite.ts b/src/js/stendhal/sprite/EmojiSprite.ts index d3abc01580..e81c22dd28 100644 --- a/src/js/stendhal/sprite/EmojiSprite.ts +++ b/src/js/stendhal/sprite/EmojiSprite.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { RPEntity } from "../entity/RPEntity"; @@ -24,7 +25,7 @@ export class EmojiSprite { this.sprite = sprite; } - draw(ctx: CanvasRenderingContext2D): boolean { + draw(ctx: RenderingContext2D): boolean { let x = this.owner["_x"] * 32 - 16; let y = this.owner["_y"] * 32 - 32; if (x < 0) { diff --git a/src/js/stendhal/sprite/EmptySprite.ts b/src/js/stendhal/sprite/EmptySprite.ts index 8ceac7cfdb..856d879b51 100644 --- a/src/js/stendhal/sprite/EmptySprite.ts +++ b/src/js/stendhal/sprite/EmptySprite.ts @@ -10,6 +10,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { Sprite } from "./Sprite"; @@ -53,7 +54,7 @@ export class EmptySprite { * @param y * The y location at which to draw the sprite */ - draw(g: CanvasRenderingContext2D, x: number, y: number): void; + draw(g: RenderingContext2D, x: number, y: number): void; /** * Draws the image. @@ -73,8 +74,8 @@ export class EmptySprite { * @param h * the height */ - public draw(g: CanvasRenderingContext2D, destx: number, desty: number, x: number, y: number, w: number, h: number): void; - public draw(g: CanvasRenderingContext2D, destx: number, desty: number, x?: number, y?: number, w?: number, h?: number): void { + public draw(g: RenderingContext2D, destx: number, desty: number, x: number, y: number, w: number, h: number): void; + public draw(g: RenderingContext2D, destx: number, desty: number, x?: number, y?: number, w?: number, h?: number): void { } /** diff --git a/src/js/stendhal/sprite/Floater.ts b/src/js/stendhal/sprite/Floater.ts index f529137473..08a4f1e925 100644 --- a/src/js/stendhal/sprite/Floater.ts +++ b/src/js/stendhal/sprite/Floater.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { TextSprite } from "./TextSprite"; /** @@ -23,7 +24,7 @@ export class Floater { this.textSprite = new TextSprite(this.message, this.color, "12px sans-serif") } - draw(ctx: CanvasRenderingContext2D, x: number, y: number): boolean { + draw(ctx: RenderingContext2D, x: number, y: number): boolean { let textOffset = this.textSprite.getTextMetrics(ctx).width / 2; var timeDiff = Date.now() - this.initTime; this.textSprite.draw(ctx, x - textOffset, y - timeDiff / 50); diff --git a/src/js/stendhal/sprite/ImageSprite.ts b/src/js/stendhal/sprite/ImageSprite.ts index 3e25d125f2..7a63c16fb4 100644 --- a/src/js/stendhal/sprite/ImageSprite.ts +++ b/src/js/stendhal/sprite/ImageSprite.ts @@ -13,6 +13,7 @@ import { ImageWithDimensions } from "data/ImageWithDimensions"; import { EmptySprite } from "./EmptySprite"; import { Sprite } from "./Sprite"; +import { Canvas, RenderingContext2D } from "util/Types"; /** * A sprite to be displayed on the screen. Note that a sprite contains no state @@ -49,7 +50,7 @@ export class ImageSprite implements Sprite { this.reference = reference; } - private static createCompatibleImage(sprite: Sprite): HTMLCanvasElement { + private static createCompatibleImage(sprite: Sprite): Canvas { const canvas = document.createElement('canvas'); const g = canvas.getContext('2d'); canvas.width = sprite.getWidth(); @@ -110,7 +111,7 @@ export class ImageSprite implements Sprite { * @param y * The y location at which to draw the sprite */ - public draw(g: CanvasRenderingContext2D, destx: number, desty: number): void; + public draw(g: RenderingContext2D, destx: number, desty: number): void; /** * Draws the image. @@ -130,8 +131,8 @@ export class ImageSprite implements Sprite { * @param h * the height */ - public draw(g: CanvasRenderingContext2D, destx: number, desty: number, x: number, y: number, w: number, h: number): void; - public draw(g: CanvasRenderingContext2D, destx: number, desty: number, x?: number, y?: number, w?: number, h?: number): void { + public draw(g: RenderingContext2D, destx: number, desty: number, x: number, y: number, w: number, h: number): void; + public draw(g: RenderingContext2D, destx: number, desty: number, x?: number, y?: number, w?: number, h?: number): void { if (arguments.length === 7) { g.drawImage(this.image, destx, desty, destx + w!, desty + h!, x!, y!, x! + w!, y! + h!); } else { diff --git a/src/js/stendhal/sprite/NotificationBubble.ts b/src/js/stendhal/sprite/NotificationBubble.ts index df6d04b6ca..032bfa2e86 100644 --- a/src/js/stendhal/sprite/NotificationBubble.ts +++ b/src/js/stendhal/sprite/NotificationBubble.ts @@ -18,6 +18,7 @@ import { Color } from "../data/color/Color"; import { NotificationType } from "../util/NotificationType"; import { Speech } from "../util/Speech"; +import { RenderingContext2D } from "util/Types"; export class NotificationBubble extends TextBubble { @@ -70,7 +71,7 @@ export class NotificationBubble extends TextBubble { } } - override draw(ctx: CanvasRenderingContext2D): boolean { + override draw(ctx: RenderingContext2D): boolean { const screenTop = stendhal.ui.gamewindow.offsetY; const screenBottom = screenTop + ctx.canvas.height; const screenLeft = stendhal.ui.gamewindow.offsetX; diff --git a/src/js/stendhal/sprite/OverlaySpriteImpl.ts b/src/js/stendhal/sprite/OverlaySpriteImpl.ts index 70da92fe57..47473d7bc6 100644 --- a/src/js/stendhal/sprite/OverlaySpriteImpl.ts +++ b/src/js/stendhal/sprite/OverlaySpriteImpl.ts @@ -10,13 +10,15 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; + export interface OverlaySpriteImpl { /** * Instructions when sprite should be drawn on viewport. * - * @param {CanvasRenderingContext2D} ctx + * @param {RenderingContext2D} ctx * The viewport canvas drawing context. * @param {number} x * Horizonal pixel position of where to draw on canvas. @@ -29,7 +31,7 @@ export interface OverlaySpriteImpl { * @returns {boolean} * `true` to denote sprite is expired & should be removed. */ - draw(ctx: CanvasRenderingContext2D, x: number, y: number, drawWidth: number, drawHeight: number) + draw(ctx: RenderingContext2D, x: number, y: number, drawWidth: number, drawHeight: number) : boolean; /** diff --git a/src/js/stendhal/sprite/SpeechBubble.ts b/src/js/stendhal/sprite/SpeechBubble.ts index 2e8b71fc75..623e9b06cf 100644 --- a/src/js/stendhal/sprite/SpeechBubble.ts +++ b/src/js/stendhal/sprite/SpeechBubble.ts @@ -19,6 +19,7 @@ import { RPEntity } from "../entity/RPEntity"; import { Pair } from "../util/Pair"; import { Speech } from "../util/Speech"; +import { RenderingContext2D } from "util/Types"; export class SpeechBubble extends TextBubble { @@ -52,7 +53,7 @@ export class SpeechBubble extends TextBubble { this.text.length * TextBubble.STANDARD_DUR / 50); } - override draw(ctx: CanvasRenderingContext2D): boolean { + override draw(ctx: RenderingContext2D): boolean { ctx.lineWidth = 2; ctx.font = "14px Arial"; ctx.fillStyle = Color.WHITE; diff --git a/src/js/stendhal/sprite/Sprite.ts b/src/js/stendhal/sprite/Sprite.ts index acfb065ba5..e64b52a3f5 100644 --- a/src/js/stendhal/sprite/Sprite.ts +++ b/src/js/stendhal/sprite/Sprite.ts @@ -10,6 +10,8 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; + /** * A sprite to be displayed on the screen. Note that a sprite contains no state * information, i.e. its just the image and not the location. This allows us to @@ -47,7 +49,7 @@ export abstract class Sprite { * @param y * The y location at which to draw the sprite */ - abstract draw(g: CanvasRenderingContext2D, x: number, y: number): void; + abstract draw(g: RenderingContext2D, x: number, y: number): void; /** * Draws the image. @@ -67,7 +69,7 @@ export abstract class Sprite { * @param h * the height */ - abstract draw(g: CanvasRenderingContext2D, destx: number, desty: number, x: number, y: number, w: number, h: number): void; + abstract draw(g: RenderingContext2D, destx: number, desty: number, x: number, y: number, w: number, h: number): void; /** * Get the height of the drawn sprite. diff --git a/src/js/stendhal/sprite/TextBubble.ts b/src/js/stendhal/sprite/TextBubble.ts index 97f4c1cc0f..fe522658b1 100644 --- a/src/js/stendhal/sprite/TextBubble.ts +++ b/src/js/stendhal/sprite/TextBubble.ts @@ -11,6 +11,7 @@ declare var stendhal: any; +import { RenderingContext2D } from "util/Types"; import { Color } from "../data/color/Color"; import { Pair } from "../util/Pair"; @@ -45,7 +46,7 @@ export abstract class TextBubble { * true if the sprites duration time has expired * & should be removed from the screen. */ - abstract draw(ctx: CanvasRenderingContext2D): boolean; + abstract draw(ctx: RenderingContext2D): boolean; getX(): number { return this.x; @@ -128,7 +129,13 @@ export abstract class TextBubble { * @param ctx * Canvas context on which text bubble is drawn. */ - onAdded(ctx: CanvasRenderingContext2D) { + onAdded(ctx: RenderingContext2D) { + // TODO: Reference the Viewport directly instead of deriving the canvas from the context + if (!(ctx instanceof CanvasRenderingContext2D)) { + console.error("Cannot add event listeners because HTMLCanvasElement is required."); + return; + } + // prevent multiple listeners from being added if (typeof(this.onRemovedAction) === "undefined") { // add click listener to remove chat bubble diff --git a/src/js/stendhal/sprite/TextSprite.ts b/src/js/stendhal/sprite/TextSprite.ts index 458ad09207..9ec21c69b2 100644 --- a/src/js/stendhal/sprite/TextSprite.ts +++ b/src/js/stendhal/sprite/TextSprite.ts @@ -9,6 +9,8 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; + export class TextSprite { private textMetrics?: TextMetrics; @@ -25,7 +27,7 @@ export class TextSprite { * @param x x coordinate * @param y y coordinate */ - public draw(ctx: CanvasRenderingContext2D, x: number, y: number) { + public draw(ctx: RenderingContext2D, x: number, y: number) { ctx.font = this.font; ctx.lineWidth = 2; ctx.strokeStyle = "black"; @@ -35,7 +37,7 @@ export class TextSprite { ctx.fillText(this.text, x, y); } - getTextMetrics(ctx: CanvasRenderingContext2D) { + getTextMetrics(ctx: RenderingContext2D) { if (!this.textMetrics) { ctx.font = this.font; this.textMetrics = ctx.measureText(this.text); diff --git a/src/js/stendhal/sprite/action/AttackSprite.ts b/src/js/stendhal/sprite/action/AttackSprite.ts index 588b62aef8..cce51d6911 100644 --- a/src/js/stendhal/sprite/action/AttackSprite.ts +++ b/src/js/stendhal/sprite/action/AttackSprite.ts @@ -10,6 +10,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { OverlaySpriteImpl } from "../OverlaySpriteImpl"; @@ -25,7 +26,7 @@ export abstract class AttackSprite implements OverlaySpriteImpl { this.initTime = Date.now(); } - abstract draw(ctx: CanvasRenderingContext2D, x: number, y: number, entityWidth: number, + abstract draw(ctx: RenderingContext2D, x: number, y: number, entityWidth: number, entityHeight: number): boolean; expired(): boolean { diff --git a/src/js/stendhal/sprite/action/BarehandAttackSprite.ts b/src/js/stendhal/sprite/action/BarehandAttackSprite.ts index c200445a04..a7e41a5b83 100644 --- a/src/js/stendhal/sprite/action/BarehandAttackSprite.ts +++ b/src/js/stendhal/sprite/action/BarehandAttackSprite.ts @@ -12,6 +12,7 @@ import { AttackSprite } from "./AttackSprite"; import { RPEntity } from "../../entity/RPEntity"; +import { RenderingContext2D } from "util/Types"; declare var stendhal: any; @@ -28,7 +29,7 @@ export class BarehandAttackSprite extends AttackSprite { this.image = image; } - override draw(ctx: CanvasRenderingContext2D, x: number, y: number, entityWidth: number, + override draw(ctx: RenderingContext2D, x: number, y: number, entityWidth: number, entityHeight: number): boolean { if (!this.image || !this.image.height) { return this.expired(); diff --git a/src/js/stendhal/sprite/action/DirectionalSkillEffect.ts b/src/js/stendhal/sprite/action/DirectionalSkillEffect.ts index 3b041cefba..c9e971be9c 100644 --- a/src/js/stendhal/sprite/action/DirectionalSkillEffect.ts +++ b/src/js/stendhal/sprite/action/DirectionalSkillEffect.ts @@ -15,6 +15,7 @@ import { SkillEffect } from "./SkillEffect"; import { Entity } from "../../entity/Entity"; import { Direction } from "../../util/Direction"; +import { RenderingContext2D } from "util/Types"; /** @@ -44,7 +45,7 @@ export class DirectionalSkillEffect extends SkillEffect { this.entity = entity; } - protected override drawInternal(ctx: CanvasRenderingContext2D, colIdx: number, x: number, + protected override drawInternal(ctx: RenderingContext2D, colIdx: number, x: number, y: number, drawWidth: number, drawHeight: number) { const dir = Direction.VALUES[parseInt(this.entity["dir"], 10)]; let rowIdx = dir.val - 1; diff --git a/src/js/stendhal/sprite/action/MeleeAttackSprite.ts b/src/js/stendhal/sprite/action/MeleeAttackSprite.ts index 4108a76b1b..8cdff51b67 100644 --- a/src/js/stendhal/sprite/action/MeleeAttackSprite.ts +++ b/src/js/stendhal/sprite/action/MeleeAttackSprite.ts @@ -15,6 +15,7 @@ declare var stendhal: any; import { AttackSprite } from "./AttackSprite"; import { RPEntity } from "../../entity/RPEntity"; import { Direction } from "../../util/Direction"; +import { RenderingContext2D } from "util/Types"; export class MeleeAttackSprite extends AttackSprite { @@ -108,7 +109,7 @@ export class MeleeAttackSprite extends AttackSprite { } } - override draw(ctx: CanvasRenderingContext2D, x: number, y: number, entityWidth: number, + override draw(ctx: RenderingContext2D, x: number, y: number, entityWidth: number, entityHeight: number): boolean { const dtime = Date.now() - this.initTime; const frameIndex = Math.floor(Math.min(dtime / 60, 2)); diff --git a/src/js/stendhal/sprite/action/RangedAttackSprite.ts b/src/js/stendhal/sprite/action/RangedAttackSprite.ts index c3385ff7c0..f1dfc47207 100644 --- a/src/js/stendhal/sprite/action/RangedAttackSprite.ts +++ b/src/js/stendhal/sprite/action/RangedAttackSprite.ts @@ -12,6 +12,7 @@ import { AttackSprite } from "./AttackSprite"; import { RPEntity } from "../../entity/RPEntity"; +import { RenderingContext2D } from "util/Types"; declare var stendhal: any; @@ -35,7 +36,7 @@ export class RangedAttackSprite extends AttackSprite { this.weapon = weapon; } - override draw(ctx: CanvasRenderingContext2D, x: number, y: number, entityWidth: number, + override draw(ctx: RenderingContext2D, x: number, y: number, entityWidth: number, entityHeight: number): boolean { // FIXME: alignment with entity is not correct diff --git a/src/js/stendhal/sprite/action/SkillEffect.ts b/src/js/stendhal/sprite/action/SkillEffect.ts index 026d6054fb..5ba8b3e27e 100644 --- a/src/js/stendhal/sprite/action/SkillEffect.ts +++ b/src/js/stendhal/sprite/action/SkillEffect.ts @@ -13,6 +13,7 @@ import { OverlaySpriteImpl } from "../OverlaySpriteImpl"; import { singletons } from "../../SingletonRepo"; +import { RenderingContext2D } from "util/Types"; /** @@ -56,7 +57,7 @@ export class SkillEffect implements OverlaySpriteImpl { /** * Draws sprite to canvas. * - * @param {CanvasRenderingContext2D} ctx + * @param {RenderingContext2D} ctx * Canvas drawing context. * @param {number} colIdx * Horizontal frame index. @@ -69,13 +70,13 @@ export class SkillEffect implements OverlaySpriteImpl { * @param {number} drawHeight * Height of each frame to draw. */ - protected drawInternal(ctx: CanvasRenderingContext2D, colIdx: number, x: number, y: number, + protected drawInternal(ctx: RenderingContext2D, colIdx: number, x: number, y: number, drawWidth: number, drawHeight: number) { ctx.drawImage(this.image, colIdx*drawWidth, 0, drawWidth, drawHeight, x, y, drawWidth, drawHeight); } - draw(ctx: CanvasRenderingContext2D, x=0, y=0, drawWidth=48, drawHeight=64): boolean { + draw(ctx: RenderingContext2D, x=0, y=0, drawWidth=48, drawHeight=64): boolean { this.drawTime = Date.now(); if (!this.image.height) { return this.expired(); diff --git a/src/js/stendhal/ui/HTMLManager.ts b/src/js/stendhal/ui/HTMLManager.ts index 18b08acc0f..490699a40d 100644 --- a/src/js/stendhal/ui/HTMLManager.ts +++ b/src/js/stendhal/ui/HTMLManager.ts @@ -9,8 +9,6 @@ * * ***************************************************************************/ -declare var stendhal: any; - /** * HTML code manipulation. diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index bd3e3c6134..19d641e07c 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -31,6 +31,7 @@ import { SpeechBubble } from "../sprite/SpeechBubble"; import { TextBubble } from "../sprite/TextBubble"; import { Point } from "../util/Point"; +import { Canvas, RenderingContext2D } from "util/Types"; /** @@ -53,7 +54,7 @@ export class ViewPort { private readonly height: number; /** Drawing context. */ - private ctx: CanvasRenderingContext2D; + private ctx: RenderingContext2D; /** Map tile pixel width. */ private readonly targetTileWidth = 32; /** Map tile pixel height. */ @@ -332,10 +333,10 @@ export class ViewPort { /** * Updates viewport drawing position of map based on player position. * - * @param canvas {HTMLCanvasElement} + * @param canvas {Canvas} * Viewport canvas element. */ - adjustView(canvas: HTMLCanvasElement) { + adjustView(canvas: Canvas) { // IE does not support ctx.resetTransform(), so use the following workaround: this.ctx.setTransform(1, 0, 0, 1, 0, 0); diff --git a/src/js/stendhal/ui/component/MiniMapComponent.ts b/src/js/stendhal/ui/component/MiniMapComponent.ts index ea0a5d464e..8f01dd678c 100644 --- a/src/js/stendhal/ui/component/MiniMapComponent.ts +++ b/src/js/stendhal/ui/component/MiniMapComponent.ts @@ -17,6 +17,7 @@ import { Component } from "../toolkit/Component"; import { Player } from "../../entity/Player"; import { Color } from "../../data/color/Color"; +import { Canvas, RenderingContext2D } from "util/Types"; /** @@ -32,7 +33,7 @@ export class MiniMapComponent extends Component { private mapWidth = 1; private mapHeight = 1; private scale = 1; - private bgImage!: HTMLCanvasElement; + private bgImage!: Canvas; private lastZone?: number[]; // ground/collision colors @@ -119,7 +120,7 @@ export class MiniMapComponent extends Component { } } - drawBackground(ctx: CanvasRenderingContext2D) { + drawBackground(ctx: RenderingContext2D) { ctx.save(); ctx.imageSmoothingEnabled = false; @@ -168,7 +169,7 @@ export class MiniMapComponent extends Component { } } - drawEntities(ctx: CanvasRenderingContext2D) { + drawEntities(ctx: RenderingContext2D) { ctx.fillStyle = Color.RED; ctx.strokeStyle = Color.BLACK; let isAdmin = marauroa.me["adminlevel"] && marauroa.me["adminlevel"] >= 600; diff --git a/src/js/stendhal/ui/component/OutfitPreviewComponent.ts b/src/js/stendhal/ui/component/OutfitPreviewComponent.ts index 91b8ab4910..4bfa862471 100644 --- a/src/js/stendhal/ui/component/OutfitPreviewComponent.ts +++ b/src/js/stendhal/ui/component/OutfitPreviewComponent.ts @@ -16,8 +16,7 @@ import { Outfit } from "../../data/Outfit"; import { Direction } from "../../util/Direction"; import { StringUtil } from "../../util/StringUtil"; - -declare var stendhal: any; +import { Canvas } from "util/Types"; /** diff --git a/src/js/stendhal/ui/component/StatBarComponent.ts b/src/js/stendhal/ui/component/StatBarComponent.ts index b25b384ca1..2f13f329a0 100644 --- a/src/js/stendhal/ui/component/StatBarComponent.ts +++ b/src/js/stendhal/ui/component/StatBarComponent.ts @@ -11,6 +11,7 @@ import { Component } from "../toolkit/Component"; import { Color } from "../../data/color/Color"; +import { RenderingContext2D } from "util/Types"; /** * TODO: move this to `ui.toolkit`. @@ -18,7 +19,7 @@ import { Color } from "../../data/color/Color"; export class StatBarComponent extends Component { readonly canvas: HTMLCanvasElement; - protected readonly ctx: CanvasRenderingContext2D; + protected readonly ctx: RenderingContext2D; constructor(id?: string) { @@ -26,7 +27,7 @@ export class StatBarComponent extends Component { id = "statbar-template"; } super(id); - this.canvas = this.componentElement; + this.canvas = this.componentElement as HTMLCanvasElement; this.ctx = this.canvas.getContext("2d")!; } diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts index 34de135338..200d38d204 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts @@ -9,12 +9,14 @@ * * ***************************************************************************/ +import { Canvas, RenderingContext2D } from "util/Types"; + declare var stendhal: any; export class OutfitColorSelector { - protected ctx: CanvasRenderingContext2D; - private gradCtx: CanvasRenderingContext2D; - protected baseImage: HTMLCanvasElement; + protected ctx: RenderingContext2D; + private gradCtx: RenderingContext2D; + protected baseImage: Canvas; private onColorChanged: Function; private _enabled: boolean; protected _x: number; diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts index 041110c265..d28cee65ba 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts @@ -9,6 +9,8 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; + declare var stendhal: any; export class OutfitPartSelector { @@ -16,7 +18,7 @@ export class OutfitPartSelector { private _onPartChanged: Function; private _index: number; private _maxindex: number; - private _ctx: CanvasRenderingContext2D; + private _ctx: RenderingContext2D; private _width: number; private _height: number; private _color?: any; diff --git a/src/js/stendhal/util/BackgroundPainter.ts b/src/js/stendhal/util/BackgroundPainter.ts index 0681a60c2c..80b3dd0a5f 100644 --- a/src/js/stendhal/util/BackgroundPainter.ts +++ b/src/js/stendhal/util/BackgroundPainter.ts @@ -9,6 +9,8 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "./Types"; + export class BackgroundPainter { @@ -54,7 +56,7 @@ export class BackgroundPainter { * @param height * Number of vertical tiles to draw. */ - paint(ctx: CanvasRenderingContext2D, x: number, y: number, + paint(ctx: RenderingContext2D, x: number, y: number, width: number, height: number) { // FIXME: if image parts were not cached, tile width & height may be 0 if (!this.tileW || !this.tileH) { diff --git a/src/js/stendhal/util/DownloadUtil.ts b/src/js/stendhal/util/DownloadUtil.ts index 776ecbb415..49b6a17f46 100644 --- a/src/js/stendhal/util/DownloadUtil.ts +++ b/src/js/stendhal/util/DownloadUtil.ts @@ -64,7 +64,7 @@ export class DownloadUtil { * * @param filename {string} * Default filename. - * @param canvas {HTMLCanvasElement} + * @param canvas {Canvas} * Canvas containing data to convert to image. * @return {util.DownloadObject.DownloadObject} * Object to be handled by browser for image download. @@ -90,7 +90,7 @@ export class DownloadUtil { /** * Creates an image download from a canvas element. * - * @param canvas {HTMLCanvasElement} + * @param canvas {Canvas} * Canvas containing data to convert to image. * @return {util.DownloadObject.DownloadObject} * Object to be handled by browser for image download. diff --git a/src/js/stendhal/util/DrawingStage.ts b/src/js/stendhal/util/DrawingStage.ts index 804e4f5338..b62531772c 100644 --- a/src/js/stendhal/util/DrawingStage.ts +++ b/src/js/stendhal/util/DrawingStage.ts @@ -10,6 +10,8 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "./Types"; + /** * Hidden canvas for manipulating images before they are displayed. @@ -19,7 +21,7 @@ export class DrawingStage { /** Hidden canvas element. */ private canvas: HTMLCanvasElement; /** Canvas's drawing context. */ - private ctx: CanvasRenderingContext2D; + private ctx: RenderingContext2D; /** Singleton instance. */ private static instance: DrawingStage; @@ -86,6 +88,7 @@ export class DrawingStage { * @returns {string} * PNG data encoded string. */ + // TODO: Do we really need this? We could use an offscreen canvas otherwise toDataURL(): string { return this.canvas.toDataURL("image/png"); } diff --git a/src/js/stendhal/util/ScreenCapture.ts b/src/js/stendhal/util/ScreenCapture.ts index ed100a8527..e4e2eef35c 100644 --- a/src/js/stendhal/util/ScreenCapture.ts +++ b/src/js/stendhal/util/ScreenCapture.ts @@ -56,7 +56,7 @@ export class ScreenCapture { /** * Begins recording. * - * @param {HTMLCanvasElement} canvas + * @param {Canvas} canvas * Canvas element to record. * @param {AudioContext=} audio * Sound manager from which to record audio. diff --git a/src/js/stendhal/util/Speech.ts b/src/js/stendhal/util/Speech.ts index f548deeb63..0808b6b3a5 100644 --- a/src/js/stendhal/util/Speech.ts +++ b/src/js/stendhal/util/Speech.ts @@ -9,6 +9,8 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "./Types"; + declare var stendhal: any @@ -27,7 +29,7 @@ export class Speech { * @param width * @param height */ - static drawBubble(ctx: CanvasRenderingContext2D, x: number, y: number, + static drawBubble(ctx: RenderingContext2D, x: number, y: number, width: number, height: number, tail: boolean=false) { ctx.strokeRect(x, y - 15, width, height); ctx.fillRect(x, y - 15, width, height); @@ -57,7 +59,7 @@ export class Speech { * @param width * @param height */ - static drawBubbleRounded(ctx: CanvasRenderingContext2D, x: number, + static drawBubbleRounded(ctx: RenderingContext2D, x: number, y: number, width: number, height: number) { //const arc = this.arc_diameter; const arc = 3; diff --git a/src/js/stendhal/util/Types.ts b/src/js/stendhal/util/Types.ts new file mode 100644 index 0000000000..49dbf3ca90 --- /dev/null +++ b/src/js/stendhal/util/Types.ts @@ -0,0 +1,2 @@ +export type RenderingContext2D = CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D; +export type Canvas = HTMLCanvasElement | OffscreenCanvas; \ No newline at end of file diff --git a/src/js/stendhal/util/WeatherRenderer.ts b/src/js/stendhal/util/WeatherRenderer.ts index 05181321b2..096144e223 100644 --- a/src/js/stendhal/util/WeatherRenderer.ts +++ b/src/js/stendhal/util/WeatherRenderer.ts @@ -12,6 +12,7 @@ import { TileStore } from "../data/TileStore"; import { SoundObject } from "../data/sound/SoundFactory"; +import { Canvas, RenderingContext2D } from "./Types"; declare var stendhal: any; @@ -143,7 +144,7 @@ export class WeatherRenderer { console.log("using failsafe sprite height: " + spriteH); } - const canvas = document.getElementById("viewport") as HTMLCanvasElement; + const canvas = document.getElementById("viewport") as Canvas; this.tilesX = Math.ceil(canvas.width / spriteH) + 1; this.tilesY = Math.ceil(canvas.height / spriteH) + 1; @@ -159,7 +160,7 @@ export class WeatherRenderer { * @param ctx * Drawing target element. */ - draw(ctx: CanvasRenderingContext2D) { + draw(ctx: RenderingContext2D) { if (this.enabled && this.sprite && this.sprite.frames) { if (!this.tilesX || !this.tilesY) { if (!this.warned.tiling) { @@ -191,11 +192,11 @@ export class WeatherRenderer { /** * Draws clouds animation. * - * @param {CanvasRenderingContext2D) ctx + * @param {RenderingContext2D) ctx * @param {number} offsetX * @param {number} offsetY */ - private drawClouds(ctx: CanvasRenderingContext2D, offsetX: number, offsetY: number) { + private drawClouds(ctx: RenderingContext2D, offsetX: number, offsetY: number) { const drawStart = Date.now(); const timeDiff = drawStart - this.lastUpdate; const dim = {width: this.sprite!.width, height: this.sprite!.height}; @@ -226,11 +227,11 @@ export class WeatherRenderer { /** * Draws fog animation. * - * @param {CanvasRenderingContext2D) ctx + * @param {RenderingContext2D) ctx * @param {number} offsetX * @param {number} offsetY */ - private drawFog(ctx: CanvasRenderingContext2D, offsetX: number, offsetY: number) { + private drawFog(ctx: RenderingContext2D, offsetX: number, offsetY: number) { ctx.save(); if (!this.heavyFog) { // reduce opacity for light fog @@ -243,11 +244,11 @@ export class WeatherRenderer { /** * Draws types of weather other than fog. * - * @param {CanvasRenderingContext2D) ctx + * @param {RenderingContext2D) ctx * @param {number} offsetX * @param {number} offsetY */ - private drawOther(ctx: CanvasRenderingContext2D, offsetX: number, offsetY: number) { + private drawOther(ctx: RenderingContext2D, offsetX: number, offsetY: number) { // width & height dimensions should be the same const dim = this.sprite!.height; const clipLeft = offsetX % dim; From 6ff59a0040c170080ed2820237bc50e0134a8570 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 28 Dec 2025 12:40:28 +0100 Subject: [PATCH 031/162] refactored drawCombinedTileAtIndex and drawTile in preparation for blend --- .../landscape/CombinedTilesetImageLoader.ts | 73 +++++++++++-------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index a042e2a91d..d0c463ea72 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RenderingContext2D } from "util/Types"; import { TileMap } from "../data/TileMap"; import { TileStore } from "../data/TileStore"; import { MapOfSets } from "../util/MapOfSets"; @@ -24,11 +25,11 @@ export class CombinedTilesetImageLoader { private landscapeAnimationMap: any; constructor( - private map: TileMap, - private indexToCombinedTiles: Map, - private combinedTileset: CombinedTileset) { - this.landscapeAnimationMap = TileStore.get().getLandscapeMap(); - } + private map: TileMap, + private indexToCombinedTiles: Map, + private combinedTileset: CombinedTileset) { + this.landscapeAnimationMap = TileStore.get().getLandscapeMap(); + } private calculateTileUsedAtIndex(): void { @@ -100,25 +101,26 @@ export class CombinedTilesetImageLoader { const pixelX = x * this.map.tileWidth; const pixelY = y * this.map.tileHeight; + // Disabled because alpha is broken + if (false && stendhal.ui.gamewindow.HSLFilter) { + this.drawCombinedTileWithBlend(tiles, pixelX, pixelY); + } else { + this.drawCombinedTileWithoutBlend(this.combinedTileset.ctx, tiles, pixelX, pixelY); + } + } + + private drawCombinedTileWithoutBlend(ctx: RenderingContext2D, tiles: number[], pixelX: number, pixelY: number) { this.combinedTileset.ctx.clearRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); for (let [i, tile] of tiles.entries()) { if (i === 0) { continue; // skip blend layer } - let flip = tile & 0xE0000000; - let gid = tile & 0x1FFFFFFF; - let tileset = this.map.getTilesetForGid(gid); - let image = this.tilesetImages[tileset]; - if (!image || !image.height) { - continue; - } - - let base = this.map.firstgids[tileset]; - let tileIndexInTileset = gid - base; - this.drawTile(pixelX, pixelY, image, tileIndexInTileset, flip); + this.drawTile(ctx, tile, pixelX, pixelY); } + } - /* + private drawCombinedTileWithBlend(tiles: number[], pixelX: number, pixelY: number) { + this.drawCombinedTileWithoutBlend(this.combinedTileset.ctx, tiles, pixelX, pixelY); if (stendhal.ui.gamewindow.HSLFilter) { this.combinedTileset.ctx.globalCompositeOperation = "multiply"; this.combinedTileset.ctx.fillStyle = stendhal.ui.gamewindow.HSLFilter; @@ -127,32 +129,34 @@ export class CombinedTilesetImageLoader { let tile = tiles[0]; this.combinedTileset.ctx.globalCompositeOperation = "soft-light"; if (tile > 0) { - let flip = tile & 0xE0000000; - let gid = tile & 0x1FFFFFFF; - let tileset = this.map.getTilesetForGid(gid); - let image = this.tilesetImages[tileset]; - if (image && image.height) { - let base = this.map.firstgids[tileset]; - let tileIndexInTileset = gid - base; - this.drawTile(pixelX, pixelY, image, tileIndexInTileset, flip); - } + this.drawTile(this.combinedTileset.ctx, tile, pixelX, pixelY); } else { this.combinedTileset.ctx.fillStyle = "black"; this.combinedTileset.ctx.fillRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); } this.combinedTileset.ctx.globalCompositeOperation = "source-over"; - // document.getElementsByTagName("body")[0].append(this.tempCanvas); } - */ } - private drawTile(pixelX: number, pixelY: number, tilesetImage: HTMLImageElement, tileIndexInTileset: number, flip: number) { + private drawTile(ctx: RenderingContext2D, tile: number, pixelX: number, pixelY: number) { + let flip = tile & 0xE0000000; + let gid = tile & 0x1FFFFFFF; + let tileset = this.map.getTilesetForGid(gid); + let image = this.tilesetImages[tileset]; + if (!image || !image.height) { + return; + } + + let base = this.map.firstgids[tileset]; + let tileIndexInTileset = gid - base; + this.drawImageTile(ctx, pixelX, pixelY, image, tileIndexInTileset, flip); + } + + private drawImageTile(ctx: RenderingContext2D, pixelX: number, pixelY: number, tilesetImage: HTMLImageElement, tileIndexInTileset: number, flip: number) { const tilesetWidth = tilesetImage.width; const tilesPerRow = Math.floor(tilesetWidth / this.map.tileWidth); - const ctx = this.combinedTileset.ctx; - if (flip === 0) { ctx.drawImage(tilesetImage, (tileIndexInTileset % tilesPerRow) * this.map.tileWidth, @@ -188,7 +192,12 @@ export class CombinedTilesetImageLoader { restore.push([0, 1, 1, 0, 0, 0]); } - this.drawTile(0, 0, tilesetImage, tileIndexInTileset, 0); + ctx.drawImage(tilesetImage, + (tileIndexInTileset % tilesPerRow) * this.map.tileWidth, + Math.floor(tileIndexInTileset / tilesPerRow) * this.map.tileHeight, + this.map.tileWidth, this.map.tileHeight, + 0, 0, + this.map.tileWidth, this.map.tileHeight); restore.reverse(); for (const args of restore) { From 09371bff4748f1bff9440cac94a17a80bf819e69 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 28 Dec 2025 14:41:39 +0100 Subject: [PATCH 032/162] restore transparency after blending --- .../landscape/CombinedTilesetImageLoader.ts | 52 +++++++++++++------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index d0c463ea72..2c1c8f16c2 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -import { RenderingContext2D } from "util/Types"; +import { Canvas, RenderingContext2D } from "util/Types"; import { TileMap } from "../data/TileMap"; import { TileStore } from "../data/TileStore"; import { MapOfSets } from "../util/MapOfSets"; @@ -23,12 +23,21 @@ export class CombinedTilesetImageLoader { private tilesetImages: HTMLImageElement[] = []; private animations: any = {}; private landscapeAnimationMap: any; + private drawCanvas: Canvas; + private drawCtx: RenderingContext2D; + private blendCanvas: Canvas; + private blendCtx: RenderingContext2D; constructor( private map: TileMap, private indexToCombinedTiles: Map, private combinedTileset: CombinedTileset) { this.landscapeAnimationMap = TileStore.get().getLandscapeMap(); + + this.drawCanvas = new OffscreenCanvas(this.map.tileWidth, this.map.tileHeight); + this.blendCanvas = new OffscreenCanvas(this.map.tileWidth, this.map.tileHeight); + this.drawCtx = this.drawCanvas.getContext("2d")!; + this.blendCtx = this.blendCanvas.getContext("2d")!; } @@ -101,16 +110,16 @@ export class CombinedTilesetImageLoader { const pixelX = x * this.map.tileWidth; const pixelY = y * this.map.tileHeight; - // Disabled because alpha is broken if (false && stendhal.ui.gamewindow.HSLFilter) { this.drawCombinedTileWithBlend(tiles, pixelX, pixelY); } else { this.drawCombinedTileWithoutBlend(this.combinedTileset.ctx, tiles, pixelX, pixelY); } + document.getElementsByTagName("body")[0].append(this.combinedTileset.canvas as HTMLCanvasElement); } private drawCombinedTileWithoutBlend(ctx: RenderingContext2D, tiles: number[], pixelX: number, pixelY: number) { - this.combinedTileset.ctx.clearRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); + ctx.clearRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); for (let [i, tile] of tiles.entries()) { if (i === 0) { continue; // skip blend layer @@ -120,23 +129,32 @@ export class CombinedTilesetImageLoader { } private drawCombinedTileWithBlend(tiles: number[], pixelX: number, pixelY: number) { - this.drawCombinedTileWithoutBlend(this.combinedTileset.ctx, tiles, pixelX, pixelY); - if (stendhal.ui.gamewindow.HSLFilter) { - this.combinedTileset.ctx.globalCompositeOperation = "multiply"; - this.combinedTileset.ctx.fillStyle = stendhal.ui.gamewindow.HSLFilter; - this.combinedTileset.ctx.fillRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); - let tile = tiles[0]; - this.combinedTileset.ctx.globalCompositeOperation = "soft-light"; - if (tile > 0) { - this.drawTile(this.combinedTileset.ctx, tile, pixelX, pixelY); - } else { - this.combinedTileset.ctx.fillStyle = "black"; - this.combinedTileset.ctx.fillRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); - } + this.drawCombinedTileWithoutBlend(this.drawCtx, tiles, 0, 0); - this.combinedTileset.ctx.globalCompositeOperation = "source-over"; + this.blendCtx.globalCompositeOperation = "source-over"; + this.blendCtx.clearRect(0, 0, this.map.tileWidth, this.map.tileHeight); + this.blendCtx.drawImage(this.drawCanvas, 0, 0); + + this.blendCtx.globalCompositeOperation = "multiply"; + this.blendCtx.fillStyle = stendhal.ui.gamewindow.HSLFilter; + this.blendCtx.fillRect(0, 0, this.map.tileWidth, this.map.tileHeight); + + let tile = tiles[0]; + this.blendCtx.globalCompositeOperation = "soft-light"; + if (tile > 0) { + this.drawTile(this.blendCtx, tile, 0, 0); + } else { + this.blendCtx.fillStyle = "black"; + this.blendCtx.fillRect(0, 0, this.map.tileWidth, this.map.tileHeight); } + + // restore transparency which was lost during multiply and soft-light composition + this.blendCtx.globalCompositeOperation = "destination-in"; + this.blendCtx.drawImage(this.drawCanvas, 0, 0); + + this.combinedTileset.ctx.clearRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); + this.combinedTileset.ctx.drawImage(this.blendCanvas, pixelX, pixelY); } private drawTile(ctx: RenderingContext2D, tile: number, pixelX: number, pixelY: number) { From 4dbe1f73fe4a1c0c635db25c9ee98bcbfa2b5610 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 28 Dec 2025 17:51:51 +0100 Subject: [PATCH 033/162] implemented light rendering (to test "/debug light" and change zone) --- src/js/stendhal/action/DebugAction.ts | 5 ++++- .../landscape/CombinedTilesetImageLoader.ts | 17 +++++++++++++++-- src/js/stendhal/ui/ViewPort.ts | 5 ++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/js/stendhal/action/DebugAction.ts b/src/js/stendhal/action/DebugAction.ts index 148a303d82..cbb0715d3a 100644 --- a/src/js/stendhal/action/DebugAction.ts +++ b/src/js/stendhal/action/DebugAction.ts @@ -55,6 +55,8 @@ export class DebugAction extends SlashAction { Debug.setActive("screencap", !Debug.isActive("screencap")); Chat.log("client", "Screen capture debugging " + (Debug.isActive("screencap") ? "enabled" : "disabled")); + } else if(params[0] === "light") { + Debug.toggle("light"); } return true; } @@ -66,7 +68,8 @@ export class DebugAction extends SlashAction { " /debug ui [pop]", " /debug weather []", " /debug settings", - " /debug touch" + " /debug touch", + " /debug light" ]; Chat.log("client", usage); } diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index 2c1c8f16c2..7fce2d3dc2 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -14,6 +14,7 @@ import { TileMap } from "../data/TileMap"; import { TileStore } from "../data/TileStore"; import { MapOfSets } from "../util/MapOfSets"; import { CombinedTileset } from "./CombinedTileset"; +import { Debug } from "../util/Debug"; declare var stendhal: any; @@ -27,6 +28,8 @@ export class CombinedTilesetImageLoader { private drawCtx: RenderingContext2D; private blendCanvas: Canvas; private blendCtx: RenderingContext2D; + private blendFixCanvas: Canvas; + private blendFixCtx: RenderingContext2D; constructor( private map: TileMap, @@ -36,8 +39,10 @@ export class CombinedTilesetImageLoader { this.drawCanvas = new OffscreenCanvas(this.map.tileWidth, this.map.tileHeight); this.blendCanvas = new OffscreenCanvas(this.map.tileWidth, this.map.tileHeight); + this.blendFixCanvas = new OffscreenCanvas(this.map.tileWidth, this.map.tileHeight); this.drawCtx = this.drawCanvas.getContext("2d")!; this.blendCtx = this.blendCanvas.getContext("2d")!; + this.blendFixCtx = this.blendFixCanvas.getContext("2d")!; } @@ -110,7 +115,7 @@ export class CombinedTilesetImageLoader { const pixelX = x * this.map.tileWidth; const pixelY = y * this.map.tileHeight; - if (false && stendhal.ui.gamewindow.HSLFilter) { + if (Debug.isActive("light") && stendhal.ui.gamewindow.HSLFilter) { this.drawCombinedTileWithBlend(tiles, pixelX, pixelY); } else { this.drawCombinedTileWithoutBlend(this.combinedTileset.ctx, tiles, pixelX, pixelY); @@ -132,6 +137,7 @@ export class CombinedTilesetImageLoader { this.drawCombinedTileWithoutBlend(this.drawCtx, tiles, 0, 0); + // copy the image to the blend canvas this.blendCtx.globalCompositeOperation = "source-over"; this.blendCtx.clearRect(0, 0, this.map.tileWidth, this.map.tileHeight); this.blendCtx.drawImage(this.drawCanvas, 0, 0); @@ -143,7 +149,13 @@ export class CombinedTilesetImageLoader { let tile = tiles[0]; this.blendCtx.globalCompositeOperation = "soft-light"; if (tile > 0) { - this.drawTile(this.blendCtx, tile, 0, 0); + // turn transparency into black for the blend layer + this.blendFixCtx.fillStyle = "black"; + this.blendFixCtx.fillRect(0, 0, this.map.tileWidth, this.map.tileHeight); + this.drawTile(this.blendFixCtx, tile, 0, 0); + + // draw the blend layer onto the blend canvas + this.blendCtx.drawImage(this.blendFixCanvas, 0, 0); } else { this.blendCtx.fillStyle = "black"; this.blendCtx.fillRect(0, 0, this.map.tileWidth, this.map.tileHeight); @@ -153,6 +165,7 @@ export class CombinedTilesetImageLoader { this.blendCtx.globalCompositeOperation = "destination-in"; this.blendCtx.drawImage(this.drawCanvas, 0, 0); + // draw the blend canvas at the correct position onto the combined tileset this.combinedTileset.ctx.clearRect(pixelX, pixelY, this.map.tileWidth, this.map.tileHeight); this.combinedTileset.ctx.drawImage(this.blendCanvas, pixelX, pixelY); } diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index 19d641e07c..3ac22fa449 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -32,6 +32,7 @@ import { TextBubble } from "../sprite/TextBubble"; import { Point } from "../util/Point"; import { Canvas, RenderingContext2D } from "util/Types"; +import { Debug } from "../util/Debug"; /** @@ -150,7 +151,9 @@ export class ViewPort { this.weatherRenderer.draw(this.ctx); //this.removeFilter(); - this.applyHSLFilter(); + if (!Debug.isActive("light")) { + this.applyHSLFilter(); + } this.drawEntitiesTop(); this.drawEmojiSprites(); this.drawTextSprites(); From 703fa6132940a33a744705013740bb8940012280 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 28 Dec 2025 18:13:15 +0100 Subject: [PATCH 034/162] cleaned up references to animations --- .../stendhal/landscape/CombinedTilesetImageLoader.ts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index 7fce2d3dc2..552ae74ff5 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -11,7 +11,6 @@ import { Canvas, RenderingContext2D } from "util/Types"; import { TileMap } from "../data/TileMap"; -import { TileStore } from "../data/TileStore"; import { MapOfSets } from "../util/MapOfSets"; import { CombinedTileset } from "./CombinedTileset"; import { Debug } from "../util/Debug"; @@ -22,8 +21,6 @@ export class CombinedTilesetImageLoader { private tileUsedAtIndex!: MapOfSets private tilesetImages: HTMLImageElement[] = []; - private animations: any = {}; - private landscapeAnimationMap: any; private drawCanvas: Canvas; private drawCtx: RenderingContext2D; private blendCanvas: Canvas; @@ -35,7 +32,6 @@ export class CombinedTilesetImageLoader { private map: TileMap, private indexToCombinedTiles: Map, private combinedTileset: CombinedTileset) { - this.landscapeAnimationMap = TileStore.get().getLandscapeMap(); this.drawCanvas = new OffscreenCanvas(this.map.tileWidth, this.map.tileHeight); this.blendCanvas = new OffscreenCanvas(this.map.tileWidth, this.map.tileHeight); @@ -78,13 +74,6 @@ export class CombinedTilesetImageLoader { } img.src = tsname + "?v=" + stendhal.data.build.version; - if (this.landscapeAnimationMap) { - const animation = this.landscapeAnimationMap[tsname]; - if (animation) { - this.animations[tileset] = animation; - } - } - this.tilesetImages[tileset] = img; } @@ -120,7 +109,6 @@ export class CombinedTilesetImageLoader { } else { this.drawCombinedTileWithoutBlend(this.combinedTileset.ctx, tiles, pixelX, pixelY); } - document.getElementsByTagName("body")[0].append(this.combinedTileset.canvas as HTMLCanvasElement); } private drawCombinedTileWithoutBlend(ctx: RenderingContext2D, tiles: number[], pixelX: number, pixelY: number) { From face9f3a675ec6192163672468edb00419bebb69 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 28 Dec 2025 18:59:53 +0100 Subject: [PATCH 035/162] use OffscreenCanvas and ImageBitmap instead of img- and canvas-elements --- src/js/stendhal/landscape/CombinedTileset.ts | 7 ++-- .../landscape/CombinedTilesetImageLoader.ts | 35 +++++++++++++------ 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/js/stendhal/landscape/CombinedTileset.ts b/src/js/stendhal/landscape/CombinedTileset.ts index 9e4f45e564..43a4b24e9b 100644 --- a/src/js/stendhal/landscape/CombinedTileset.ts +++ b/src/js/stendhal/landscape/CombinedTileset.ts @@ -32,11 +32,10 @@ export class CombinedTileset { // The original approach used an a very wide image of 32 pixel height. // But both Firefox and Chrome are limit the dimension of an image to 2^15 pixels. this.tilesPerRow = Math.ceil(Math.sqrt(numberOfTiles)); - this.canvas = document.createElement("canvas"); - this.canvas.width = stendhal.data.map.tileWidth * this.tilesPerRow; - this.canvas.height = stendhal.data.map.tileHeight * this.tilesPerRow; + this.canvas = new OffscreenCanvas( + stendhal.data.map.tileWidth * this.tilesPerRow, + stendhal.data.map.tileHeight * this.tilesPerRow); this.ctx = this.canvas.getContext("2d")!; } - } diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index 552ae74ff5..dc0f024bd4 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -20,13 +20,15 @@ declare var stendhal: any; export class CombinedTilesetImageLoader { private tileUsedAtIndex!: MapOfSets - private tilesetImages: HTMLImageElement[] = []; + private tilesetImages: ImageBitmap[] = []; private drawCanvas: Canvas; private drawCtx: RenderingContext2D; private blendCanvas: Canvas; private blendCtx: RenderingContext2D; private blendFixCanvas: Canvas; private blendFixCtx: RenderingContext2D; + private loadedTilesetCount = 0; + private usedTilesetCount = 0; constructor( private map: TileMap, @@ -62,19 +64,30 @@ export class CombinedTilesetImageLoader { } - private loadTileset(tileset: number) { - let img = document.createElement("img"); - img.onload = () => { - this.drawTileset(tileset); - } - + private async loadTileset(tileset: number) { const tsname = this.map.tilesetFilenames[tileset]; if (!tsname) { return; } - img.src = tsname + "?v=" + stendhal.data.build.version; + let url = tsname + "?v=" + stendhal.data.build.version; + let response = await fetch(url); + if (!response.ok) { + return; + } + let blob = await response.blob(); + let bitmap = await createImageBitmap(blob); + this.tilesetImages[tileset] = bitmap; + this.loadedTilesetCount++; + this.drawTileset(tileset); + if (this.loadedTilesetCount >= this.usedTilesetCount) { + this.finish(); + } + } - this.tilesetImages[tileset] = img; + private finish() { + for (let bitmap of this.tilesetImages) { + bitmap.close(); + } } @@ -172,7 +185,7 @@ export class CombinedTilesetImageLoader { this.drawImageTile(ctx, pixelX, pixelY, image, tileIndexInTileset, flip); } - private drawImageTile(ctx: RenderingContext2D, pixelX: number, pixelY: number, tilesetImage: HTMLImageElement, tileIndexInTileset: number, flip: number) { + private drawImageTile(ctx: RenderingContext2D, pixelX: number, pixelY: number, tilesetImage: ImageBitmap, tileIndexInTileset: number, flip: number) { const tilesetWidth = tilesetImage.width; const tilesPerRow = Math.floor(tilesetWidth / this.map.tileWidth); @@ -230,9 +243,9 @@ export class CombinedTilesetImageLoader { console.log("CombinedTilesetImageLoader.load()"); this.calculateTileUsedAtIndex(); let usedTilesets = this.calculateUsedTilesets(this.tileUsedAtIndex.keys()); + this.usedTilesetCount = usedTilesets.size; for (let tileset of usedTilesets) { this.loadTileset(tileset); } - } } From 7546fbba80164f75f0bdc1b4d05244e0520a8db6 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 30 Dec 2025 00:24:38 +0100 Subject: [PATCH 036/162] removed unused library --- buildtools/ant_modules/dist.xml | 2 +- src/js/jsxgraph-util.js | 1169 ------------------------------- 2 files changed, 1 insertion(+), 1170 deletions(-) delete mode 100644 src/js/jsxgraph-util.js diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index cf2414630a..ac9cfc3542 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -722,7 +722,7 @@ - + diff --git a/src/js/jsxgraph-util.js b/src/js/jsxgraph-util.js deleted file mode 100644 index c2ab4938ab..0000000000 --- a/src/js/jsxgraph-util.js +++ /dev/null @@ -1,1169 +0,0 @@ -/* - From: http://jsxgraph.uni-bayreuth.de/wp/tag/gunzip/ - From: https://jsxgraph.org/wp/ - - Copyright 2008,2009 - Matthias Ehmann, - Michael Gerhaeuser, - Carsten Miller, - Bianca Valentin, - Alfred Wassermann, - Peter Wilfahrt - - This file is part of JSXGraph. - - JSXGraph is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - JSXGraph is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with JSXGraph. If not, see . -*/ - -/** - * @fileoverview Utilities for uncompressing and base64 decoding - */ - -/** - * @class Util class - * Class for gunzipping, unzipping and base64 decoding of files. - * It is used for reading GEONExT, Geogebra and Intergeo files. - * - * Only Huffman codes are decoded in gunzip. - * The code is based on the source code for gunzip.c by Pasi Ojala - * @see http://www.cs.tut.fi/~albert/Dev/gunzip/gunzip.c - * @see http://www.cs.tut.fi/~albert - */ -JXG = {}; -JXG.Util = {}; - -/** - * Unzip zip files - */ -JXG.Util.Unzip = function (barray){ - var outputArr = [], - output = "", - debug = false, - gpflags, - files = 0, - unzipped = [], - crc, - buf32k = new Array(32768), - bIdx = 0, - modeZIP=false, - - CRC, SIZE, - - bitReverse = [ - 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, - 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, - 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, - 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, - 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, - 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, - 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, - 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, - 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, - 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, - 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, - 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, - 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, - 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, - 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, - 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, - 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, - 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, - 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, - 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, - 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, - 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, - 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, - 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, - 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, - 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, - 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, - 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, - 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, - 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, - 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, - 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff - ], - - cplens = [ - 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, - 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 - ], - - cplext = [ - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, - 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99 - ], /* 99==invalid */ - - cpdist = [ - 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0007, 0x0009, 0x000d, - 0x0011, 0x0019, 0x0021, 0x0031, 0x0041, 0x0061, 0x0081, 0x00c1, - 0x0101, 0x0181, 0x0201, 0x0301, 0x0401, 0x0601, 0x0801, 0x0c01, - 0x1001, 0x1801, 0x2001, 0x3001, 0x4001, 0x6001 - ], - - cpdext = [ - 0, 0, 0, 0, 1, 1, 2, 2, - 3, 3, 4, 4, 5, 5, 6, 6, - 7, 7, 8, 8, 9, 9, 10, 10, - 11, 11, 12, 12, 13, 13 - ], - - border = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15], - - bA = barray, - - bytepos=0, - bitpos=0, - bb = 1, - bits=0, - - NAMEMAX = 256, - - nameBuf = [], - - fileout; - - function readByte(){ - bits+=8; - if (bytepos"); - return bA[bytepos++]; - } else - return -1; - }; - - function byteAlign(){ - bb = 1; - }; - - function readBit(){ - var carry; - bits++; - carry = (bb & 1); - bb >>= 1; - if (bb==0){ - bb = readByte(); - carry = (bb & 1); - bb = (bb>>1) | 0x80; - } - return carry; - }; - - function readBits(a) { - var res = 0, - i = a; - - while(i--) { - res = (res<<1) | readBit(); - } - if(a) { - res = bitReverse[res]>>(8-a); - } - return res; - }; - - function flushBuffer(){ - //document.write('FLUSHBUFFER:'+buf32k); - bIdx = 0; - }; - function addBuffer(a){ - SIZE++; - //CRC=updcrc(a,crc); - buf32k[bIdx++] = a; - outputArr.push(String.fromCharCode(a)); - //output+=String.fromCharCode(a); - if(bIdx==0x8000){ - //document.write('ADDBUFFER:'+buf32k); - bIdx=0; - } - }; - - function HufNode() { - this.b0=0; - this.b1=0; - this.jump = null; - this.jumppos = -1; - }; - - var LITERALS = 288; - - var literalTree = new Array(LITERALS); - var distanceTree = new Array(32); - var treepos=0; - var Places = null; - var Places2 = null; - - var impDistanceTree = new Array(64); - var impLengthTree = new Array(64); - - var len = 0; - var fpos = new Array(17); - fpos[0]=0; - var flens; - var fmax; - - function IsPat() { - while (1) { - if (fpos[len] >= fmax) - return -1; - if (flens[fpos[len]] == len) - return fpos[len]++; - fpos[len]++; - } - }; - - function Rec() { - var curplace = Places[treepos]; - var tmp; - if (debug) - document.write("
len:"+len+" treepos:"+treepos); - if(len==17) { //war 17 - return -1; - } - treepos++; - len++; - - tmp = IsPat(); - if (debug) - document.write("
IsPat "+tmp); - if(tmp >= 0) { - curplace.b0 = tmp; /* leaf cell for 0-bit */ - if (debug) - document.write("
b0 "+curplace.b0); - } else { - /* Not a Leaf cell */ - curplace.b0 = 0x8000; - if (debug) - document.write("
b0 "+curplace.b0); - if(Rec()) - return -1; - } - tmp = IsPat(); - if(tmp >= 0) { - curplace.b1 = tmp; /* leaf cell for 1-bit */ - if (debug) - document.write("
b1 "+curplace.b1); - curplace.jump = null; /* Just for the display routine */ - } else { - /* Not a Leaf cell */ - curplace.b1 = 0x8000; - if (debug) - document.write("
b1 "+curplace.b1); - curplace.jump = Places[treepos]; - curplace.jumppos = treepos; - if(Rec()) - return -1; - } - len--; - return 0; - }; - - function CreateTree(currentTree, numval, lengths, show) { - var i; - /* Create the Huffman decode tree/table */ - //document.write("
createtree
"); - if (debug) - document.write("currentTree "+currentTree+" numval "+numval+" lengths "+lengths+" show "+show); - Places = currentTree; - treepos=0; - flens = lengths; - fmax = numval; - for (i=0;i<17;i++) - fpos[i] = 0; - len = 0; - if(Rec()) { - //fprintf(stderr, "invalid huffman tree\n"); - if (debug) - alert("invalid huffman tree\n"); - return -1; - } - if (debug){ - document.write('
Tree: '+Places.length); - for (var a=0;a<32;a++){ - document.write("Places["+a+"].b0="+Places[a].b0+"
"); - document.write("Places["+a+"].b1="+Places[a].b1+"
"); - } - } - - /*if(show) { - var tmp; - for(tmp=currentTree;tmpjump?tmp->jump-currentTree:0,(tmp->jump?tmp->jump-currentTree:0)*6+0xcf0); - if(!(tmp.b0 & 0x8000)) { - //fprintf(stdout, " 0x%03x (%c)", tmp->b0,(tmp->b0<256 && isprint(tmp->b0))?tmp->b0:'�'); - } - if(!(tmp.b1 & 0x8000)) { - if((tmp.b0 & 0x8000)) - fprintf(stdout, " "); - fprintf(stdout, " 0x%03x (%c)", tmp->b1,(tmp->b1<256 && isprint(tmp->b1))?tmp->b1:'�'); - } - fprintf(stdout, "\n"); - } - }*/ - return 0; - }; - - function DecodeValue(currentTree) { - var len, i, - xtreepos=0, - X = currentTree[xtreepos], - b; - - /* decode one symbol of the data */ - while(1) { - b=readBit(); - if (debug) - document.write("b="+b); - if(b) { - if(!(X.b1 & 0x8000)){ - if (debug) - document.write("ret1"); - return X.b1; /* If leaf node, return data */ - } - X = X.jump; - len = currentTree.length; - for (i=0;i>1); - if(j > 23) { - j = (j<<1) | readBit(); /* 48..255 */ - - if(j > 199) { /* 200..255 */ - j -= 128; /* 72..127 */ - j = (j<<1) | readBit(); /* 144..255 << */ - } else { /* 48..199 */ - j -= 48; /* 0..151 */ - if(j > 143) { - j = j+136; /* 280..287 << */ - /* 0..143 << */ - } - } - } else { /* 0..23 */ - j += 256; /* 256..279 << */ - } - if(j < 256) { - addBuffer(j); - //document.write("out:"+String.fromCharCode(j)); - /*fprintf(errfp, "@%d %02x\n", SIZE, j);*/ - } else if(j == 256) { - /* EOF */ - break; - } else { - var len, dist; - - j -= 256 + 1; /* bytes + EOF */ - len = readBits(cplext[j]) + cplens[j]; - - j = bitReverse[readBits(5)]>>3; - if(cpdext[j] > 8) { - dist = readBits(8); - dist |= (readBits(cpdext[j]-8)<<8); - } else { - dist = readBits(cpdext[j]); - } - dist += cpdist[j]; - - /*fprintf(errfp, "@%d (l%02x,d%04x)\n", SIZE, len, dist);*/ - for(j=0;jparam: "+literalCodes+" "+distCodes+" "+lenCodes+"
"); - for(j=0; j<19; j++) { - ll[j] = 0; - } - - // Get the decode tree code lengths - - //document.write("
"); - for(j=0; jll:'+ll); - len = distanceTree.length; - for (i=0; idistanceTree"); - for(var a=0;a"+distanceTree[a].b0+" "+distanceTree[a].b1+" "+distanceTree[a].jump+" "+distanceTree[a].jumppos); - /*if (distanceTree[a].jumppos!=-1) - document.write(" "+distanceTree[a].jump.b0+" "+distanceTree[a].jump.b1); - */ - } - } - //document.write('
tree created'); - - //read in literal and distance code lengths - n = literalCodes + distCodes; - i = 0; - var z=-1; - if (debug) - document.write("
n="+n+" bits: "+bits+"
"); - while(i < n) { - z++; - j = DecodeValue(distanceTree); - if (debug) - document.write("
"+z+" i:"+i+" decode: "+j+" bits "+bits+"
"); - if(j<16) { // length of code in bits (0..15) - ll[i++] = j; - } else if(j==16) { // repeat last length 3 to 6 times - var l; - j = 3 + readBits(2); - if(i+j > n) { - flushBuffer(); - return 1; - } - l = i ? ll[i-1] : 0; - while(j--) { - ll[i++] = l; - } - } else { - if(j==17) { // 3 to 10 zero length codes - j = 3 + readBits(3); - } else { // j == 18: 11 to 138 zero length codes - j = 11 + readBits(7); - } - if(i+j > n) { - flushBuffer(); - return 1; - } - while(j--) { - ll[i++] = 0; - } - } - } - /*for(j=0; jliteralTree"); - while(1) { - j = DecodeValue(literalTree); - if(j >= 256) { // In C64: if carry set - var len, dist; - j -= 256; - if(j == 0) { - // EOF - break; - } - j--; - len = readBits(cplext[j]) + cplens[j]; - - j = DecodeValue(distanceTree); - if(cpdext[j] > 8) { - dist = readBits(8); - dist |= (readBits(cpdext[j]-8)<<8); - } else { - dist = readBits(cpdext[j]); - } - dist += cpdist[j]; - while(len--) { - var c = buf32k[(bIdx - dist) & 0x7fff]; - addBuffer(c); - } - } else { - addBuffer(j); - } - } - } - } while(!last); - flushBuffer(); - - byteAlign(); - return 0; - }; - - JXG.Util.Unzip.prototype.unzipFile = function(name) { - var i; - this.unzip(); - //alert(unzipped[0][1]); - for (i=0;i"); - } - */ - //alert(bA); - nextFile(); - return unzipped; - }; - - function nextFile(){ - if (debug) - alert("NEXTFILE"); - outputArr = []; - var tmp = []; - modeZIP = false; - tmp[0] = readByte(); - tmp[1] = readByte(); - if (debug) - alert("type: "+tmp[0]+" "+tmp[1]); - if (tmp[0] == parseInt("78",16) && tmp[1] == parseInt("da",16)){ //GZIP - if (debug) - alert("GEONExT-GZIP"); - DeflateLoop(); - if (debug) - alert(outputArr.join('')); - unzipped[files] = new Array(2); - unzipped[files][0] = outputArr.join(''); - unzipped[files][1] = "geonext.gxt"; - files++; - } - if (tmp[0] == parseInt("1f",16) && tmp[1] == parseInt("8b",16)){ //GZIP - if (debug) - alert("GZIP"); - //DeflateLoop(); - skipdir(); - if (debug) - alert(outputArr.join('')); - unzipped[files] = new Array(2); - unzipped[files][0] = outputArr.join(''); - unzipped[files][1] = "file"; - files++; - } - if (tmp[0] == parseInt("50",16) && tmp[1] == parseInt("4b",16)){ //ZIP - modeZIP = true; - tmp[2] = readByte(); - tmp[3] = readByte(); - if (tmp[2] == parseInt("3",16) && tmp[3] == parseInt("4",16)){ - //MODE_ZIP - tmp[0] = readByte(); - tmp[1] = readByte(); - if (debug) - alert("ZIP-Version: "+tmp[1]+" "+tmp[0]/10+"."+tmp[0]%10); - - gpflags = readByte(); - gpflags |= (readByte()<<8); - if (debug) - alert("gpflags: "+gpflags); - - var method = readByte(); - method |= (readByte()<<8); - if (debug) - alert("method: "+method); - - readByte(); - readByte(); - readByte(); - readByte(); - - var crc = readByte(); - crc |= (readByte()<<8); - crc |= (readByte()<<16); - crc |= (readByte()<<24); - - var compSize = readByte(); - compSize |= (readByte()<<8); - compSize |= (readByte()<<16); - compSize |= (readByte()<<24); - - var size = readByte(); - size |= (readByte()<<8); - size |= (readByte()<<16); - size |= (readByte()<<24); - - if (debug) - alert("local CRC: "+crc+"\nlocal Size: "+size+"\nlocal CompSize: "+compSize); - - var filelen = readByte(); - filelen |= (readByte()<<8); - - var extralen = readByte(); - extralen |= (readByte()<<8); - - if (debug) - alert("filelen "+filelen); - i = 0; - nameBuf = []; - while (filelen--){ - var c = readByte(); - if (c == "/" | c ==":"){ - i = 0; - } else if (i < NAMEMAX-1) - nameBuf[i++] = String.fromCharCode(c); - } - if (debug) - alert("nameBuf: "+nameBuf); - - //nameBuf[i] = "\0"; - if (!fileout) - fileout = nameBuf; - - var i = 0; - while (i < extralen){ - c = readByte(); - i++; - } - - CRC = 0xffffffff; - SIZE = 0; - - if (size = 0 && fileOut.charAt(fileout.length-1)=="/"){ - //skipdir - if (debug) - alert("skipdir"); - } - if (method == 8){ - DeflateLoop(); - if (debug) - alert(outputArr.join('')); - unzipped[files] = new Array(2); - unzipped[files][0] = outputArr.join(''); - unzipped[files][1] = nameBuf.join(''); - files++; - //return outputArr.join(''); - } - skipdir(); - } - } - }; - - function skipdir(){ - var crc, - tmp = [], - compSize, size, os, i, c; - - if ((gpflags & 8)) { - tmp[0] = readByte(); - tmp[1] = readByte(); - tmp[2] = readByte(); - tmp[3] = readByte(); - - if (tmp[0] == parseInt("50",16) && - tmp[1] == parseInt("4b",16) && - tmp[2] == parseInt("07",16) && - tmp[3] == parseInt("08",16)) - { - crc = readByte(); - crc |= (readByte()<<8); - crc |= (readByte()<<16); - crc |= (readByte()<<24); - } else { - crc = tmp[0] | (tmp[1]<<8) | (tmp[2]<<16) | (tmp[3]<<24); - } - - compSize = readByte(); - compSize |= (readByte()<<8); - compSize |= (readByte()<<16); - compSize |= (readByte()<<24); - - size = readByte(); - size |= (readByte()<<8); - size |= (readByte()<<16); - size |= (readByte()<<24); - - if (debug) - alert("CRC:"); - } - - if (modeZIP) - nextFile(); - - tmp[0] = readByte(); - if (tmp[0] != 8) { - if (debug) - alert("Unknown compression method!"); - return 0; - } - - gpflags = readByte(); - if (debug){ - if ((gpflags & ~(parseInt("1f",16)))) - alert("Unknown flags set!"); - } - - readByte(); - readByte(); - readByte(); - readByte(); - - readByte(); - os = readByte(); - - if ((gpflags & 4)){ - tmp[0] = readByte(); - tmp[2] = readByte(); - len = tmp[0] + 256*tmp[1]; - if (debug) - alert("Extra field size: "+len); - for (i=0;ihttp://www.webtoolkit.info/ -*/ -JXG.Util.Base64 = { - - // private property - _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", - - // public method for encoding - encode : function (input) { - var output = [], - chr1, chr2, chr3, enc1, enc2, enc3, enc4, - i = 0; - - input = JXG.Util.Base64._utf8_encode(input); - - while (i < input.length) { - - chr1 = input.charCodeAt(i++); - chr2 = input.charCodeAt(i++); - chr3 = input.charCodeAt(i++); - - enc1 = chr1 >> 2; - enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); - enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); - enc4 = chr3 & 63; - - if (isNaN(chr2)) { - enc3 = enc4 = 64; - } else if (isNaN(chr3)) { - enc4 = 64; - } - - output.push([this._keyStr.charAt(enc1), - this._keyStr.charAt(enc2), - this._keyStr.charAt(enc3), - this._keyStr.charAt(enc4)].join('')); - } - - return output.join(''); - }, - - // public method for decoding - decode : function (input, utf8) { - var output = [], - chr1, chr2, chr3, - enc1, enc2, enc3, enc4, - i = 0; - - input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); - - while (i < input.length) { - - enc1 = this._keyStr.indexOf(input.charAt(i++)); - enc2 = this._keyStr.indexOf(input.charAt(i++)); - enc3 = this._keyStr.indexOf(input.charAt(i++)); - enc4 = this._keyStr.indexOf(input.charAt(i++)); - - chr1 = (enc1 << 2) | (enc2 >> 4); - chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); - chr3 = ((enc3 & 3) << 6) | enc4; - - output.push(String.fromCharCode(chr1)); - - if (enc3 != 64) { - output.push(String.fromCharCode(chr2)); - } - if (enc4 != 64) { - output.push(String.fromCharCode(chr3)); - } - } - - output = output.join(''); - - if (utf8) { - output = JXG.Util.Base64._utf8_decode(output); - } - return output; - - }, - - // private method for UTF-8 encoding - _utf8_encode : function (string) { - string = string.replace(/\r\n/g,"\n"); - var utftext = ""; - - for (var n = 0; n < string.length; n++) { - - var c = string.charCodeAt(n); - - if (c < 128) { - utftext += String.fromCharCode(c); - } - else if((c > 127) && (c < 2048)) { - utftext += String.fromCharCode((c >> 6) | 192); - utftext += String.fromCharCode((c & 63) | 128); - } - else { - utftext += String.fromCharCode((c >> 12) | 224); - utftext += String.fromCharCode(((c >> 6) & 63) | 128); - utftext += String.fromCharCode((c & 63) | 128); - } - - } - - return utftext; - }, - - // private method for UTF-8 decoding - _utf8_decode : function (utftext) { - var string = [], - i = 0, - c = 0, c2 = 0, c3 = 0; - - while ( i < utftext.length ) { - c = utftext.charCodeAt(i); - if (c < 128) { - string.push(String.fromCharCode(c)); - i++; - } - else if((c > 191) && (c < 224)) { - c2 = utftext.charCodeAt(i+1); - string.push(String.fromCharCode(((c & 31) << 6) | (c2 & 63))); - i += 2; - } - else { - c2 = utftext.charCodeAt(i+1); - c3 = utftext.charCodeAt(i+2); - string.push(String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63))); - i += 3; - } - } - return string.join(''); - }, - - _destrip: function (stripped, wrap){ - var lines = [], lineno, i, - destripped = []; - - if (wrap==null) - wrap = 76; - - stripped.replace(/ /g, ""); - lineno = stripped.length / wrap; - for (i = 0; i < lineno; i++) - lines[i]=stripped.substr(i * wrap, wrap); - if (lineno != stripped.length / wrap) - lines[lines.length]=stripped.substr(lineno * wrap, stripped.length-(lineno * wrap)); - - for (i = 0; i < lines.length; i++) - destripped.push(lines[i]); - return destripped.join('\n'); - }, - - decodeAsArray: function (input){ - var dec = this.decode(input), - ar = [], i; - for (i=0;i255){ - switch (c) { - case 8364: c=128; - break; - case 8218: c=130; - break; - case 402: c=131; - break; - case 8222: c=132; - break; - case 8230: c=133; - break; - case 8224: c=134; - break; - case 8225: c=135; - break; - case 710: c=136; - break; - case 8240: c=137; - break; - case 352: c=138; - break; - case 8249: c=139; - break; - case 338: c=140; - break; - case 381: c=142; - break; - case 8216: c=145; - break; - case 8217: c=146; - break; - case 8220: c=147; - break; - case 8221: c=148; - break; - case 8226: c=149; - break; - case 8211: c=150; - break; - case 8212: c=151; - break; - case 732: c=152; - break; - case 8482: c=153; - break; - case 353: c=154; - break; - case 8250: c=155; - break; - case 339: c=156; - break; - case 382: c=158; - break; - case 376: c=159; - break; - default: - break; - } - } - return c; -}; - -/** - * Decoding string into utf-8 - * @param {String} string to decode - * @return {String} utf8 decoded string - */ -JXG.Util.utf8Decode = function(utftext) { - var string = []; - var i = 0; - var c = 0, c1 = 0, c2 = 0; - - while ( i < utftext.length ) { - c = utftext.charCodeAt(i); - - if (c < 128) { - string.push(String.fromCharCode(c)); - i++; - } else if((c > 191) && (c < 224)) { - c2 = utftext.charCodeAt(i+1); - string.push(String.fromCharCode(((c & 31) << 6) | (c2 & 63))); - i += 2; - } else { - c2 = utftext.charCodeAt(i+1); - c3 = utftext.charCodeAt(i+2); - string.push(String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63))); - i += 3; - } - }; - return string.join(''); -}; From cbf971e632f66f4a0ce81e0196ceee4f9da6032b Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 2 Jan 2026 01:37:39 +0100 Subject: [PATCH 037/162] replace stendhal.paths with Paths to ensure correct init order --- src/js/stendhal/action/DebugAction.ts | 3 +- src/js/stendhal/data/Outfit.ts | 3 +- src/js/stendhal/data/TileStore.ts | 5 +-- src/js/stendhal/data/sound/SoundManager.ts | 11 +++--- src/js/stendhal/entity/Blood.ts | 7 ++-- src/js/stendhal/entity/Chest.ts | 7 ++-- src/js/stendhal/entity/Corpse.ts | 13 +++---- src/js/stendhal/entity/Creature.ts | 3 +- src/js/stendhal/entity/DomesticAnimal.ts | 5 +-- src/js/stendhal/entity/Door.ts | 5 +-- src/js/stendhal/entity/Entity.ts | 3 +- src/js/stendhal/entity/Food.ts | 5 +-- src/js/stendhal/entity/GameBoard.ts | 5 +-- src/js/stendhal/entity/Gate.ts | 5 +-- src/js/stendhal/entity/Ground.ts | 8 +++-- .../stendhal/entity/GrowingEntitySpawner.ts | 5 +-- src/js/stendhal/entity/InvisibleEntity.ts | 3 +- src/js/stendhal/entity/Item.ts | 5 +-- src/js/stendhal/entity/NPC.ts | 3 +- src/js/stendhal/entity/Player.ts | 5 +-- src/js/stendhal/entity/Portal.ts | 3 +- src/js/stendhal/entity/RPEntity.ts | 35 ++++++++++--------- src/js/stendhal/entity/Sign.ts | 5 +-- src/js/stendhal/entity/TrainingDummy.ts | 3 +- src/js/stendhal/entity/UseableEntity.ts | 3 +- src/js/stendhal/entity/VisibleEntity.ts | 5 +-- src/js/stendhal/entity/WalkBlocker.ts | 3 +- src/js/stendhal/event/ShowItemListEvent.ts | 3 +- src/js/stendhal/sprite/AchievementBanner.ts | 5 +-- src/js/stendhal/sprite/NotificationBubble.ts | 3 +- .../sprite/action/RangedAttackSprite.ts | 3 +- .../ui/component/BuddyListComponent.ts | 5 +-- .../ui/component/ChatInputComponent.ts | 3 +- .../component/ItemContainerImplementation.ts | 9 ++--- .../ui/component/StatusesListComponent.ts | 5 +-- src/js/stendhal/ui/dialog/EmojiMapDialog.ts | 3 +- src/js/stendhal/ui/dialog/TravelLogDialog.ts | 3 +- .../ui/dialog/outfit/OutfitPartSelector.ts | 3 +- src/js/stendhal/ui/joystick/JoystickImpl.ts | 3 +- src/js/stendhal/util/ConfigManager.ts | 5 +-- src/js/stendhal/util/Nature.ts | 4 +-- src/js/stendhal/util/SessionManager.ts | 4 ++- src/js/stendhal/util/WeatherRenderer.ts | 3 +- 43 files changed, 134 insertions(+), 96 deletions(-) diff --git a/src/js/stendhal/action/DebugAction.ts b/src/js/stendhal/action/DebugAction.ts index cbb0715d3a..648664b972 100644 --- a/src/js/stendhal/action/DebugAction.ts +++ b/src/js/stendhal/action/DebugAction.ts @@ -21,6 +21,7 @@ import { Panel } from "ui/toolkit/Panel"; import { Chat } from "../util/Chat"; import { Debug } from "../util/Debug"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -138,7 +139,7 @@ export class DebugAction extends SlashAction { if (weather) { weather = weather.replace(/ /g, "_"); - const wfilename = stendhal.paths.weather + "/" + weather + ".png"; + const wfilename = Paths.weather + "/" + weather + ".png"; if (!stendhal.data.sprites.getCached(wfilename)) { Chat.logH("error", "unknown weather: " + wfilename); return; diff --git a/src/js/stendhal/data/Outfit.ts b/src/js/stendhal/data/Outfit.ts index 41aad65b05..15010fd80a 100644 --- a/src/js/stendhal/data/Outfit.ts +++ b/src/js/stendhal/data/Outfit.ts @@ -13,6 +13,7 @@ import { DrawingStage } from "../util/DrawingStage"; import { Pair } from "../util/Pair"; import { StringUtil } from "../util/StringUtil"; +import { Paths } from "./Paths"; declare var stendhal: any; @@ -235,7 +236,7 @@ export class Outfit { layerName = layerName.replace(/-rear$/, ""); } const layerIndex = l.second; - let layerPath = stendhal.paths.sprites + "/outfit/" + layerName + "/" + let layerPath = Paths.sprites + "/outfit/" + layerName + "/" + StringUtil.padLeft(""+layerIndex, "0", 3) + suffix; if (layerName === "body" && stendhal.config.getBoolean("effect.no-nude")) { // FIXME: some non-player pickable bodies don't have "no-nude" variant diff --git a/src/js/stendhal/data/TileStore.ts b/src/js/stendhal/data/TileStore.ts index 17e20db3e9..1a3c2f2e73 100644 --- a/src/js/stendhal/data/TileStore.ts +++ b/src/js/stendhal/data/TileStore.ts @@ -12,9 +12,6 @@ import { Paths } from "./Paths"; import { JSONLoader } from "../util/JSONLoader"; -declare var stendhal: any; - - type AnimationMap = { [key: string]: any; } @@ -70,7 +67,7 @@ export class TileStore { this.landscapeMap = this.loadAnimations( loader.data["landscape"], Paths.tileset + "/"); this.weatherMap = this.loadAnimations( - loader.data["weather"], stendhal.paths.weather + "/"); + loader.data["weather"], Paths.weather + "/"); }; loader.load(Paths.tileset + "/animation.json"); } diff --git a/src/js/stendhal/data/sound/SoundManager.ts b/src/js/stendhal/data/sound/SoundManager.ts index 27c8194081..743948db63 100644 --- a/src/js/stendhal/data/sound/SoundManager.ts +++ b/src/js/stendhal/data/sound/SoundManager.ts @@ -16,9 +16,8 @@ import { SoundFactory } from "./SoundFactory"; import { SoundObject } from "./SoundFactory"; import { SoundLayer } from "./SoundLayer"; -import { singletons } from "../../SingletonRepo"; - import { ui } from "../../ui/UI"; +import { Paths } from "../Paths"; /** @@ -244,7 +243,7 @@ export class SoundManager { let snd = this.cache[soundName] || this.cacheGlobal[soundName]; if (!snd) { // add new sound to cache - snd = this.load(soundName, stendhal.paths.sounds + "/" + soundName + ".ogg"); + snd = this.load(soundName, Paths.sounds + "/" + soundName + ".ogg"); } if (!this.cache[soundName]) { @@ -406,7 +405,7 @@ export class SoundManager { volume=1.0): SoundObject|undefined { // load into cache so playEffect doesn't look in "data/sounds" if (!this.cache[musicName]) { - this.load(musicName, stendhal.paths.music + "/" + musicName + ".ogg"); + this.load(musicName, Paths.music + "/" + musicName + ".ogg"); } return this.playLocalizedLoop(x, y, radius, layer, musicName, volume); } @@ -424,7 +423,7 @@ export class SoundManager { playGlobalizedMusic(musicName: string, volume=1.0): SoundObject|undefined { // load into cache so playEffect doesn't look in "data/sounds" if (!this.cache[musicName]) { - this.load(musicName, stendhal.paths.music + "/" + musicName + ".ogg"); + this.load(musicName, Paths.music + "/" + musicName + ".ogg"); } return this.playGlobalizedLoop(musicName, "music", volume); } @@ -796,6 +795,6 @@ export class SoundManager { startupCache() { // login sound this.load("ui/login", - stendhal.paths.sounds + "/ui/login.ogg", true); + Paths.sounds + "/ui/login.ogg", true); } } diff --git a/src/js/stendhal/entity/Blood.ts b/src/js/stendhal/entity/Blood.ts index c94abc0ea3..ea30c4df77 100644 --- a/src/js/stendhal/entity/Blood.ts +++ b/src/js/stendhal/entity/Blood.ts @@ -11,6 +11,7 @@ import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; +import { Paths } from "../data/Paths"; declare var stendhal: any; @@ -24,7 +25,7 @@ export class Blood extends Entity { this.sprite = { height: 32, width: 32, - filename: stendhal.paths.sprites + "/combat/blood_red.png" + filename: Paths.sprites + "/combat/blood_red.png" }; } @@ -33,12 +34,12 @@ export class Blood extends Entity { if (key === "amount") { this.sprite.offsetY = parseInt(value, 10) * 32; } else if (key === "class") { - this.sprite.filename = stendhal.paths.sprites + "/combat/blood_" + value + ".png"; + this.sprite.filename = Paths.sprites + "/combat/blood_" + value + ".png"; } } override getCursor(x: number, y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/walk.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/walk.png) 1 3, auto"; } override drawSpriteAt(ctx: RenderingContext2D, x: number, y: number) { diff --git a/src/js/stendhal/entity/Chest.ts b/src/js/stendhal/entity/Chest.ts index f6a9b7f63b..9a38e51d4e 100644 --- a/src/js/stendhal/entity/Chest.ts +++ b/src/js/stendhal/entity/Chest.ts @@ -19,20 +19,21 @@ import { FloatingWindow } from "../ui/toolkit/FloatingWindow"; import { ItemInventoryComponent } from "../ui/component/ItemInventoryComponent"; import { Chat } from "../util/Chat"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; let OPEN_SPRITE = { - filename: stendhal.paths.sprites + "/chest.png", + filename: Paths.sprites + "/chest.png", height: 32, width: 32, offsetY: 32 }; let CLOSED_SPRITE = { - filename: stendhal.paths.sprites + "/chest.png", + filename: Paths.sprites + "/chest.png", height: 32, width: 32 }; @@ -151,7 +152,7 @@ export class Chest extends PopupInventory { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/bag.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/bag.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index 40cd34db9e..18b16292aa 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -18,6 +18,7 @@ import { FloatingWindow } from "../ui/toolkit/FloatingWindow"; import { Chat } from "../util/Chat"; import { PopupInventory } from "./PopupInventory"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -45,9 +46,9 @@ export class Corpse extends PopupInventory { const bloodEnabled = stendhal.config.getBoolean("effect.blood"); if (bloodEnabled && (key === "image")) { - this.sprite.filename = stendhal.paths.sprites + "/corpse/" + value + ".png"; + this.sprite.filename = Paths.sprites + "/corpse/" + value + ".png"; } else if (!bloodEnabled && (key === "harmless_image")) { - this.sprite.filename = stendhal.paths.sprites + "/corpse/" + value + ".png"; + this.sprite.filename = Paths.sprites + "/corpse/" + value + ".png"; } } @@ -169,18 +170,18 @@ export class Corpse extends PopupInventory { override getCursor(_x: number, _y: number) { if (this.isEmpty()) { - return "url(" + stendhal.paths.sprites + "/cursor/emptybag.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/emptybag.png) 1 3, auto"; } // owner if (!this["corpse_owner"] || (this["corpse_owner"] == marauroa.me["_name"])) { - return "url(" + stendhal.paths.sprites + "/cursor/bag.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/bag.png) 1 3, auto"; } if ((stendhal.data.group.lootmode === "shared") && (stendhal.data.group.members[this["corpse_owner"]])) { - return "url(" + stendhal.paths.sprites + "/cursor/bag.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/bag.png) 1 3, auto"; } - return "url(" + stendhal.paths.sprites + "/cursor/lockedbag.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/lockedbag.png) 1 3, auto"; } public override isDraggable(): boolean { diff --git a/src/js/stendhal/entity/Creature.ts b/src/js/stendhal/entity/Creature.ts index 7b58ebfbe3..97523a4d46 100644 --- a/src/js/stendhal/entity/Creature.ts +++ b/src/js/stendhal/entity/Creature.ts @@ -16,6 +16,7 @@ import { EntityOverlayRegistry } from "../data/EntityOverlayRegistry"; import { Color } from "../data/color/Color"; import { SkillEffect } from "../sprite/action/SkillEffect"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -52,7 +53,7 @@ export class Creature extends RPEntity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/attack.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/attack.png) 1 3, auto"; } /** diff --git a/src/js/stendhal/entity/DomesticAnimal.ts b/src/js/stendhal/entity/DomesticAnimal.ts index 0ffbd015d9..9de58f8730 100644 --- a/src/js/stendhal/entity/DomesticAnimal.ts +++ b/src/js/stendhal/entity/DomesticAnimal.ts @@ -14,6 +14,7 @@ import { MenuItem} from "../action/MenuItem"; import { Color } from "../data/color/Color"; import { RenderingContext2D } from "util/Types"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -28,7 +29,7 @@ export class DomesticAnimal extends RPEntity { if (this["_rpclass"] == "sheep") { this["largeWeight"] = 60; } - this.imagePath = stendhal.paths.sprites + "/" + this["_rpclass"] + ".png"; + this.imagePath = Paths.sprites + "/" + this["_rpclass"] + ".png"; } var localX = this["_x"] * 32; @@ -56,7 +57,7 @@ export class DomesticAnimal extends RPEntity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/look.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/look.png) 1 3, auto"; } override buildActions(list: MenuItem[]) { diff --git a/src/js/stendhal/entity/Door.ts b/src/js/stendhal/entity/Door.ts index 78cf9cdfc3..b7577b5b8f 100644 --- a/src/js/stendhal/entity/Door.ts +++ b/src/js/stendhal/entity/Door.ts @@ -12,6 +12,7 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Portal } from "./Portal"; +import { Paths } from "../data/Paths"; declare var stendhal: any; @@ -20,7 +21,7 @@ export class Door extends Portal { override zIndex = 5000; override draw(ctx: RenderingContext2D) { - let imagePath = stendhal.paths.sprites + "/doors/" + this["class"] + ".png"; + let imagePath = Paths.sprites + "/doors/" + this["class"] + ".png"; let image = stendhal.data.sprites.get(imagePath); if (image.height) { let height = image.height / 2; @@ -51,7 +52,7 @@ export class Door extends Portal { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/portal.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/portal.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/Entity.ts b/src/js/stendhal/entity/Entity.ts index 659a191146..9f02254fd4 100644 --- a/src/js/stendhal/entity/Entity.ts +++ b/src/js/stendhal/entity/Entity.ts @@ -13,6 +13,7 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Chat } from "../util/Chat"; import { RPObject } from "./RPObject"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -275,7 +276,7 @@ export class Entity extends RPObject { cursor = this["cursor"]; } - return "url(" + stendhal.paths.sprites + "/cursor/" + cursor.toLowerCase().replace("_", "") + ".png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/" + cursor.toLowerCase().replace("_", "") + ".png) 1 3, auto"; } /** diff --git a/src/js/stendhal/entity/Food.ts b/src/js/stendhal/entity/Food.ts index 9927d1a5e2..5e862a5acd 100644 --- a/src/js/stendhal/entity/Food.ts +++ b/src/js/stendhal/entity/Food.ts @@ -11,6 +11,7 @@ import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -29,7 +30,7 @@ export class Food extends Entity { } override draw(ctx: RenderingContext2D) { - var image = stendhal.data.sprites.get(stendhal.paths.sprites + "/food.png"); + var image = stendhal.data.sprites.get(Paths.sprites + "/food.png"); if (image.height) { var localX = this["x"] * 32; var localY = this["y"] * 32; @@ -51,7 +52,7 @@ export class Food extends Entity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/look.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/look.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/GameBoard.ts b/src/js/stendhal/entity/GameBoard.ts index 412e11fbbb..915cad8eac 100644 --- a/src/js/stendhal/entity/GameBoard.ts +++ b/src/js/stendhal/entity/GameBoard.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; declare var stendhal: any; @@ -29,7 +30,7 @@ export class GameBoard extends Entity { override set(key: string, value: any) { super.set(key, value); if (key === "class") { - this.sprite.filename = stendhal.paths.sprites + "/gameboard/" + this.sprite.filename = Paths.sprites + "/gameboard/" + this["class"] + ".png"; } } @@ -39,7 +40,7 @@ export class GameBoard extends Entity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/walk.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/walk.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/Gate.ts b/src/js/stendhal/entity/Gate.ts index c40d22eddc..c01efc68f0 100644 --- a/src/js/stendhal/entity/Gate.ts +++ b/src/js/stendhal/entity/Gate.ts @@ -12,6 +12,7 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Entity } from "./Entity"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -47,7 +48,7 @@ export class Gate extends Entity { override draw(ctx: RenderingContext2D) { if (this._image == undefined) { - var filename = stendhal.paths.sprites + "/doors/" + this["image"] + "_" + this["orientation"] + ".png"; + var filename = Paths.sprites + "/doors/" + this["image"] + "_" + this["orientation"] + ".png"; this._image = stendhal.data.sprites.get(filename); } if (this._image.height) { @@ -75,7 +76,7 @@ export class Gate extends Entity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/activity.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/activity.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/Ground.ts b/src/js/stendhal/entity/Ground.ts index 68c69f360e..a8d9adc7cf 100644 --- a/src/js/stendhal/entity/Ground.ts +++ b/src/js/stendhal/entity/Ground.ts @@ -9,6 +9,8 @@ * * ***************************************************************************/ +import { Paths } from "../data/Paths"; + declare var marauroa: any; declare var stendhal: any; @@ -48,14 +50,14 @@ export class Ground { getCursor(x: number, y: number): string { if ((x < 15) || (y < 15) || (x > stendhal.data.map.zoneSizeX * 32 - 15) || (y > stendhal.data.map.zoneSizeY * 32 - 15)) { - return "url(" + stendhal.paths.sprites + "/cursor/walkborder.png) 1 3, auto" + return "url(" + Paths.sprites + "/cursor/walkborder.png) 1 3, auto" } var worldX = Math.floor(x / 32); var worldY = Math.floor(y / 32); if (stendhal.data.map.collision(worldX, worldY)) { - return "url(" + stendhal.paths.sprites + "/cursor/stop.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/stop.png) 1 3, auto"; } - return "url(" + stendhal.paths.sprites + "/cursor/walk.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/walk.png) 1 3, auto"; } onclick(x: number, y: number, dblclick: boolean) { diff --git a/src/js/stendhal/entity/GrowingEntitySpawner.ts b/src/js/stendhal/entity/GrowingEntitySpawner.ts index ef78f70751..e05edc09c4 100644 --- a/src/js/stendhal/entity/GrowingEntitySpawner.ts +++ b/src/js/stendhal/entity/GrowingEntitySpawner.ts @@ -12,6 +12,7 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Entity } from "./Entity"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -65,7 +66,7 @@ export class GrowingEntitySpawner extends Entity { class_name = class_name.replace(" ", "_"); } - var image = stendhal.data.sprites.get(stendhal.paths.sprites + "/" + class_name + ".png"); + var image = stendhal.data.sprites.get(Paths.sprites + "/" + class_name + ".png"); if (image.height) { // image.complete is true on missing image files var count = parseInt(this["max_ripeness"], 10) + 1; var drawHeight = image.height / count; @@ -76,7 +77,7 @@ export class GrowingEntitySpawner extends Entity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/harvest.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/harvest.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/InvisibleEntity.ts b/src/js/stendhal/entity/InvisibleEntity.ts index 36afdfe64c..2d862a24b7 100644 --- a/src/js/stendhal/entity/InvisibleEntity.ts +++ b/src/js/stendhal/entity/InvisibleEntity.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; declare var stendhal: any; @@ -20,7 +21,7 @@ export class InvisibleEntity extends Entity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/walk.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/walk.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/Item.ts b/src/js/stendhal/entity/Item.ts index f33f920bb6..0dd58ac5f6 100644 --- a/src/js/stendhal/entity/Item.ts +++ b/src/js/stendhal/entity/Item.ts @@ -14,6 +14,7 @@ import { MenuItem } from "../action/MenuItem"; import { Entity } from "./Entity"; import { TextSprite } from "../sprite/TextSprite"; import { RenderingContext2D } from "util/Types"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -73,7 +74,7 @@ export class Item extends Entity { override set(key: string, value: any) { super.set(key, value); if (key === "class" || key === "subclass") { - this.sprite.filename = stendhal.paths.sprites + "/items/" + this.sprite.filename = Paths.sprites + "/items/" + this["class"] + "/" + this["subclass"] + ".png"; } if (key === "quantity") { @@ -132,7 +133,7 @@ export class Item extends Entity { } else { cursor = ItemMap.getCursor(this["class"], this["name"]); } - return "url(" + stendhal.paths.sprites + "/cursor/" + cursor + ".png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/" + cursor + ".png) 1 3, auto"; } public getToolTip(): string { diff --git a/src/js/stendhal/entity/NPC.ts b/src/js/stendhal/entity/NPC.ts index 26071a2b0c..0acb1a1223 100644 --- a/src/js/stendhal/entity/NPC.ts +++ b/src/js/stendhal/entity/NPC.ts @@ -15,6 +15,7 @@ import { EntityOverlayRegistry } from "../data/EntityOverlayRegistry"; import { Color } from "../data/color/Color"; import { RenderingContext2D } from "util/Types"; +import { Paths } from "../data/Paths"; declare var stendhal: any; @@ -55,7 +56,7 @@ export class NPC extends RPEntity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/look.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/look.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/Player.ts b/src/js/stendhal/entity/Player.ts index d600bf3e36..98e71bac07 100644 --- a/src/js/stendhal/entity/Player.ts +++ b/src/js/stendhal/entity/Player.ts @@ -23,6 +23,7 @@ import { GroupPanelComponent } from "../ui/component/GroupPanelComponent"; import { Color } from "../data/color/Color"; import { RenderingContext2D } from "util/Types"; +import { Paths } from "../data/Paths"; export class Player extends RPEntity { @@ -237,8 +238,8 @@ export class Player extends RPEntity { override getCursor(_x: number, _y: number) { if (this.isVisibleToAction(false)) { - return "url(" + stendhal.paths.sprites + "/cursor/look.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/look.png) 1 3, auto"; } - return "url(" + stendhal.paths.sprites + "/cursor/walk.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/walk.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/Portal.ts b/src/js/stendhal/entity/Portal.ts index 27a62d3ea7..2410693c7f 100644 --- a/src/js/stendhal/entity/Portal.ts +++ b/src/js/stendhal/entity/Portal.ts @@ -13,6 +13,7 @@ import { Entity } from "./Entity"; import { MenuItem } from "../action/MenuItem"; import { Color } from "../data/color/Color"; +import { Paths } from "../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -75,7 +76,7 @@ export class Portal extends Entity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/portal.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/portal.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/RPEntity.ts b/src/js/stendhal/entity/RPEntity.ts index d20881020f..9c9b7f5f40 100644 --- a/src/js/stendhal/entity/RPEntity.ts +++ b/src/js/stendhal/entity/RPEntity.ts @@ -34,6 +34,7 @@ import { RangedAttackSprite } from "../sprite/action/RangedAttackSprite"; import { ImageWithDimensions } from "data/ImageWithDimensions"; import { RenderingContext2D } from "util/Types"; +import { Paths } from "../data/Paths"; var HEALTH_BAR_HEIGHT = 6; @@ -312,7 +313,7 @@ export class RPEntity extends ActiveEntity { part = part.replace(/-rear$/, ""); } - const filename = stendhal.paths.sprites + "/outfit/" + part + "/" + n + ".png"; + const filename = Paths.sprites + "/outfit/" + part + "/" + n + ".png"; const colors = this["outfit_colors"]; let colorname; if (stendhal.data.outfit.isSkinLayer(part)) { @@ -362,7 +363,7 @@ export class RPEntity extends ActiveEntity { if (typeof(this["outfit"]) != "undefined" || typeof(this["outfit_ext"]) != "undefined") { this.drawMultipartOutfit(ctx); } else { - let filename = stendhal.paths.sprites + "/" + this.spritePath + "/" + this["class"]; + let filename = Paths.sprites + "/" + this.spritePath + "/" + this["class"]; if (typeof(this["subclass"]) != "undefined") { filename = filename + "/" + this["subclass"]; } @@ -420,13 +421,13 @@ export class RPEntity extends ActiveEntity { var x = this["_x"] * 32 - 10; var y = (this["_y"] + 1) * 32; if (this.hasOwnProperty("choking")) { - ctx.drawImage(stendhal.data.sprites.get(stendhal.paths.sprites + "/ideas/choking.png"), x, y - 10); + ctx.drawImage(stendhal.data.sprites.get(Paths.sprites + "/ideas/choking.png"), x, y - 10); } else if (this.hasOwnProperty("eating")) { - ctx.drawImage(stendhal.data.sprites.get(stendhal.paths.sprites + "/ideas/eat.png"), x, y - 10); + ctx.drawImage(stendhal.data.sprites.get(Paths.sprites + "/ideas/eat.png"), x, y - 10); } // NPC and pet idea icons if (this.hasOwnProperty("idea")) { - const idea = stendhal.paths.sprites + "/ideas/" + this["idea"] + ".png"; + const idea = Paths.sprites + "/ideas/" + this["idea"] + ".png"; const ani = stendhal.data.sprites.animations.idea[this["idea"]]; if (ani) { drawAnimatedIcon(idea, ani.delay, x + ani.offsetX * this["width"], @@ -437,36 +438,36 @@ export class RPEntity extends ActiveEntity { } } if (this.hasOwnProperty("away")) { - drawAnimatedIcon(stendhal.paths.sprites + "/ideas/away.png", 1500, x + 32 * this["width"], y - this["drawHeight"]); + drawAnimatedIcon(Paths.sprites + "/ideas/away.png", 1500, x + 32 * this["width"], y - this["drawHeight"]); } if (this.hasOwnProperty("grumpy")) { - drawAnimatedIcon(stendhal.paths.sprites + "/ideas/grumpy.png", 1000, x + 5, y - this["drawHeight"]); + drawAnimatedIcon(Paths.sprites + "/ideas/grumpy.png", 1000, x + 5, y - this["drawHeight"]); } if (this.hasOwnProperty("last_player_kill_time")) { - drawAnimatedIconWithFrames(stendhal.paths.sprites + "/ideas/pk.png", 12, 300, x, y - this["drawHeight"]); + drawAnimatedIconWithFrames(Paths.sprites + "/ideas/pk.png", 12, 300, x, y - this["drawHeight"]); } // status affects if (this.hasOwnProperty("poisoned")) { - drawAnimatedIcon(stendhal.paths.sprites + "/status/poison.png", 100, x + 32 * this["width"] - 10, y - this["drawHeight"]); + drawAnimatedIcon(Paths.sprites + "/status/poison.png", 100, x + 32 * this["width"] - 10, y - this["drawHeight"]); } if (this.hasOwnProperty("status_confuse")) { - drawAnimatedIcon(stendhal.paths.sprites + "/status/confuse.png", 200, x + 32 * this["width"] - 14, y - this["drawHeight"] + 16); + drawAnimatedIcon(Paths.sprites + "/status/confuse.png", 200, x + 32 * this["width"] - 14, y - this["drawHeight"] + 16); } if (this.hasOwnProperty("status_shock")) { - drawAnimatedIcon(stendhal.paths.sprites + "/status/shock.png", 200, x + 32 * this["width"] - 25, y - 32, 38); + drawAnimatedIcon(Paths.sprites + "/status/shock.png", 200, x + 32 * this["width"] - 25, y - 32, 38); } // NPC job icons let nextX = x; if (this.hasOwnProperty("job_healer")) { - ctx.drawImage(stendhal.data.sprites.get(stendhal.paths.sprites + "/status/healer.png"), nextX, y - 10); + ctx.drawImage(stendhal.data.sprites.get(Paths.sprites + "/status/healer.png"), nextX, y - 10); nextX += 12; } if (this.hasOwnProperty("job_merchant")) { - ctx.drawImage(stendhal.data.sprites.get(stendhal.paths.sprites + "/status/merchant.png"), nextX, y - 10); + ctx.drawImage(stendhal.data.sprites.get(Paths.sprites + "/status/merchant.png"), nextX, y - 10); nextX += 12; } if (this.hasOwnProperty("job_producer")) { - ctx.drawImage(stendhal.data.sprites.get(stendhal.paths.sprites + "/status/producer.png"), nextX, y - 16); + ctx.drawImage(stendhal.data.sprites.get(Paths.sprites + "/status/producer.png"), nextX, y - 16); nextX += 16; } } @@ -714,21 +715,21 @@ export class RPEntity extends ActiveEntity { } onDamaged(_source: Entity, damage: number) { - this.attackResult = this.createResultIcon(stendhal.paths.sprites + "/combat/hitted.png"); + this.attackResult = this.createResultIcon(Paths.sprites + "/combat/hitted.png"); var sounds = ["attack-melee-01", "attack-melee-02", "attack-melee-03", "attack-melee-04", "attack-melee-05", "attack-melee-06", "attack-melee-07"]; var index = Math.floor(Math.random() * Math.floor(sounds.length)); stendhal.sound.playLocalizedEffect(this["_x"], this["_y"], 20, 3, sounds[index], 1); } onBlocked(_source: Entity) { - this.attackResult = this.createResultIcon(stendhal.paths.sprites + "/combat/blocked.png"); + this.attackResult = this.createResultIcon(Paths.sprites + "/combat/blocked.png"); var sounds = ["clang-metallic-1", "clang-dull-1"]; var index = Math.floor(Math.random() * Math.floor(sounds.length)); stendhal.sound.playLocalizedEffect(this["_x"], this["_y"], 20, 3, sounds[index], 1); } onMissed(_source: Entity) { - this.attackResult = this.createResultIcon(stendhal.paths.sprites + "/combat/missed.png"); + this.attackResult = this.createResultIcon(Paths.sprites + "/combat/missed.png"); } protected onHPChanged(change: number) { diff --git a/src/js/stendhal/entity/Sign.ts b/src/js/stendhal/entity/Sign.ts index 03debd3039..cde383aee3 100644 --- a/src/js/stendhal/entity/Sign.ts +++ b/src/js/stendhal/entity/Sign.ts @@ -12,6 +12,7 @@ import { Entity } from "./Entity"; import { ActivityIndicatorSprite } from "../sprite/ActivityIndicatorSprite"; import { RenderingContext2D } from "util/Types"; +import { Paths } from "../data/Paths"; declare var stendhal: any; @@ -35,7 +36,7 @@ export class Sign extends Entity { override draw(ctx: RenderingContext2D) { if (!this.imagePath) { - this.imagePath = stendhal.paths.sprites + "/signs/" + this["class"] + ".png"; + this.imagePath = Paths.sprites + "/signs/" + this["class"] + ".png"; } var image = stendhal.data.sprites.get(this.imagePath); if (image.height) { @@ -53,7 +54,7 @@ export class Sign extends Entity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/look.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/look.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/TrainingDummy.ts b/src/js/stendhal/entity/TrainingDummy.ts index d2984622ce..9f4460fc21 100644 --- a/src/js/stendhal/entity/TrainingDummy.ts +++ b/src/js/stendhal/entity/TrainingDummy.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { Paths } from "../data/Paths"; import { NPC } from "./NPC"; declare var marauroa: any; @@ -29,6 +30,6 @@ export class TrainingDummy extends NPC { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/attack.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/attack.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/UseableEntity.ts b/src/js/stendhal/entity/UseableEntity.ts index 4ec2317aa8..d9bdf003c4 100644 --- a/src/js/stendhal/entity/UseableEntity.ts +++ b/src/js/stendhal/entity/UseableEntity.ts @@ -13,6 +13,7 @@ declare var stendhal: any; import { Entity } from "./Entity"; import { MenuItem } from "../action/MenuItem"; +import { Paths } from "../data/Paths"; export class UseableEntity extends Entity { @@ -30,7 +31,7 @@ export class UseableEntity extends Entity { override set(key: string, value: any) { super.set(key, value); if (key === "class" || key === "name") { - this.sprite.filename = stendhal.paths.sprites + "/" + this.sprite.filename = Paths.sprites + "/" + this["class"] + "/" + this["_name"] + ".png"; } if (key === "state") { diff --git a/src/js/stendhal/entity/VisibleEntity.ts b/src/js/stendhal/entity/VisibleEntity.ts index 12cea77ae8..854a29fc22 100644 --- a/src/js/stendhal/entity/VisibleEntity.ts +++ b/src/js/stendhal/entity/VisibleEntity.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; declare var stendhal: any; @@ -28,7 +29,7 @@ export class VisibleEntity extends Entity { override set(key: string, value: any) { super.set(key, value); if (key === "class" || key === "subclass" || key === "_name") { - this.sprite.filename = stendhal.paths.sprites + "/" + this.sprite.filename = Paths.sprites + "/" + (this["class"] || "") + "/" + (this["subclass"] || "") + "/" + (this["_name"] || "") + ".png"; @@ -42,7 +43,7 @@ export class VisibleEntity extends Entity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/look.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/look.png) 1 3, auto"; } } diff --git a/src/js/stendhal/entity/WalkBlocker.ts b/src/js/stendhal/entity/WalkBlocker.ts index 7d8ccd650d..ddaed24826 100644 --- a/src/js/stendhal/entity/WalkBlocker.ts +++ b/src/js/stendhal/entity/WalkBlocker.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; declare var stendhal: any; @@ -22,7 +23,7 @@ export class WalkBlocker extends Entity { } override getCursor(_x: number, _y: number) { - return "url(" + stendhal.paths.sprites + "/cursor/stop.png) 1 3, auto"; + return "url(" + Paths.sprites + "/cursor/stop.png) 1 3, auto"; } } diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts index 7b3c1f26d1..9bd77e7089 100644 --- a/src/js/stendhal/event/ShowItemListEvent.ts +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -15,6 +15,7 @@ import { RPEvent } from "./RPEvent"; import { ui } from "../ui/UI"; import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; import { Chat } from "../util/Chat"; +import { Paths } from "../data/Paths"; declare var stendhal: any; @@ -94,7 +95,7 @@ export class ShowItemListEvent extends RPEvent { const itemCell = document.createElement("td"); itemCell.appendChild( stendhal.data.sprites.get( - stendhal.paths.sprites + "/items/" + i.img + Paths.sprites + "/items/" + i.img ) ); row.appendChild(itemCell); diff --git a/src/js/stendhal/sprite/AchievementBanner.ts b/src/js/stendhal/sprite/AchievementBanner.ts index 5b5a8511da..12d2427b8f 100644 --- a/src/js/stendhal/sprite/AchievementBanner.ts +++ b/src/js/stendhal/sprite/AchievementBanner.ts @@ -12,6 +12,7 @@ import { TextBubble } from "./TextBubble"; import { BackgroundPainter } from "../util/BackgroundPainter"; import { RenderingContext2D } from "util/Types"; +import { Paths } from "../data/Paths"; declare const stendhal: any; @@ -33,9 +34,9 @@ export class AchievementBanner extends TextBubble { constructor(cat: string, title: string, desc: string) { super(desc); this.title = title; - const bg = stendhal.data.sprites.get(stendhal.paths.gui + "/banner_background.png"); + const bg = stendhal.data.sprites.get(Paths.gui + "/banner_background.png"); this.banner = new BackgroundPainter(bg); - this.icon = stendhal.data.sprites.get(stendhal.paths.achievements + this.icon = stendhal.data.sprites.get(Paths.achievements + "/" + cat.toLowerCase() + ".png"); /* keep achievements on the screen a bit longer since they diff --git a/src/js/stendhal/sprite/NotificationBubble.ts b/src/js/stendhal/sprite/NotificationBubble.ts index 032bfa2e86..7c4e6d7d83 100644 --- a/src/js/stendhal/sprite/NotificationBubble.ts +++ b/src/js/stendhal/sprite/NotificationBubble.ts @@ -19,6 +19,7 @@ import { Color } from "../data/color/Color"; import { NotificationType } from "../util/NotificationType"; import { Speech } from "../util/Speech"; import { RenderingContext2D } from "util/Types"; +import { Paths } from "../data/Paths"; export class NotificationBubble extends TextBubble { @@ -133,7 +134,7 @@ export class NotificationBubble extends TextBubble { * Loads a profile image to be drawn with text. */ private loadProfileSprite() { - const img = stendhal.data.sprites.get(stendhal.paths.sprites + const img = stendhal.data.sprites.get(Paths.sprites + "/npc/" + this.profileName + ".png"); if (img.complete && img.height) { this.profile = stendhal.data.sprites.getAreaOf(img, 48, 48, 48, 128); diff --git a/src/js/stendhal/sprite/action/RangedAttackSprite.ts b/src/js/stendhal/sprite/action/RangedAttackSprite.ts index f1dfc47207..4323a90384 100644 --- a/src/js/stendhal/sprite/action/RangedAttackSprite.ts +++ b/src/js/stendhal/sprite/action/RangedAttackSprite.ts @@ -13,6 +13,7 @@ import { AttackSprite } from "./AttackSprite"; import { RPEntity } from "../../entity/RPEntity"; import { RenderingContext2D } from "util/Types"; +import { Paths } from "../../data/Paths"; declare var stendhal: any; @@ -23,7 +24,7 @@ export class RangedAttackSprite extends AttackSprite { private readonly targetX: number; private readonly targetY: number; private readonly color: string; - private readonly image = stendhal.data.sprites.get(stendhal.paths.sprites + "/combat/ranged.png"); + private readonly image = stendhal.data.sprites.get(Paths.sprites + "/combat/ranged.png"); private readonly weapon?: string; diff --git a/src/js/stendhal/ui/component/BuddyListComponent.ts b/src/js/stendhal/ui/component/BuddyListComponent.ts index 18ec0bd96e..9c2d0c7254 100644 --- a/src/js/stendhal/ui/component/BuddyListComponent.ts +++ b/src/js/stendhal/ui/component/BuddyListComponent.ts @@ -16,6 +16,7 @@ import { Component } from "../toolkit/Component"; import { ActionContextMenu } from "../dialog/ActionContextMenu"; import { ChatInputComponent } from "./ChatInputComponent"; +import { Paths } from "../../data/Paths"; declare let marauroa: any; @@ -66,9 +67,9 @@ export class BuddyListComponent extends Component { for (let i = 0; i < buddies.length; i++) { html += "
  • " + stendhal.ui.html.esc(buddies[i].name) + "
    • "; } diff --git a/src/js/stendhal/ui/component/ChatInputComponent.ts b/src/js/stendhal/ui/component/ChatInputComponent.ts index 22f2fd898d..df8c7254ae 100644 --- a/src/js/stendhal/ui/component/ChatInputComponent.ts +++ b/src/js/stendhal/ui/component/ChatInputComponent.ts @@ -21,6 +21,7 @@ import { Component } from "../toolkit/Component"; import { singletons } from "../../SingletonRepo"; import { ChatCompletionHelper } from "../../util/ChatCompletionHelper"; import { KeyCode } from "../../util/KeyCode"; +import { Paths } from "../../data/Paths"; /** @@ -86,7 +87,7 @@ export class ChatInputComponent extends Component { btn_emoji.innerText = "☺"; } else { // set image for emoji button - btn_emoji.appendChild(stendhal.data.sprites.get(stendhal.paths.sprites + "/emoji/smile.png").cloneNode()); + btn_emoji.appendChild(stendhal.data.sprites.get(Paths.sprites + "/emoji/smile.png").cloneNode()); } } diff --git a/src/js/stendhal/ui/component/ItemContainerImplementation.ts b/src/js/stendhal/ui/component/ItemContainerImplementation.ts index 8cbbed7a8a..5939106f3b 100644 --- a/src/js/stendhal/ui/component/ItemContainerImplementation.ts +++ b/src/js/stendhal/ui/component/ItemContainerImplementation.ts @@ -21,6 +21,7 @@ import { Item } from "../../entity/Item"; import { singletons } from "../../SingletonRepo"; import { Point } from "../../util/Point"; +import { Paths } from "../../data/Paths"; /** @@ -131,7 +132,7 @@ export class ItemContainerImplementation { } e.style.backgroundImage = "url(" - + stendhal.data.sprites.checkPath(stendhal.paths.sprites + + stendhal.data.sprites.checkPath(Paths.sprites + "/items/" + o["class"] + "/" + o["subclass"] + ".png") + ")"; e.style.backgroundPosition = (xOffset+1) + "px " + (yOffset+1) + "px"; @@ -148,7 +149,7 @@ export class ItemContainerImplementation { for (let i = cnt; i < this.size; i++) { let e = this.parentElement.querySelector("#" + this.slot +this. suffix + i) as HTMLElement; if (this.defaultImage) { - e.style.backgroundImage = "url(" + stendhal.paths.gui + "/" + this.defaultImage + ")"; + e.style.backgroundImage = "url(" + Paths.gui + "/" + this.defaultImage + ")"; } else { e.style.backgroundImage = "none"; } @@ -427,14 +428,14 @@ export class ItemContainerImplementation { private updateCursor(target: HTMLElement, item?: Item) { if (item) { if (this.slot === "content" && stendhal.config.getBoolean("inventory.quick-pickup")) { - target.style.cursor = "url(" + stendhal.paths.sprites + target.style.cursor = "url(" + Paths.sprites + "/cursor/itempickupfromslot.png) 1 3, auto"; return; } target.style.cursor = item.getCursor(0, 0); return; } - target.style.cursor = "url(" + stendhal.paths.sprites + target.style.cursor = "url(" + Paths.sprites + "/cursor/normal.png) 1 3, auto"; } diff --git a/src/js/stendhal/ui/component/StatusesListComponent.ts b/src/js/stendhal/ui/component/StatusesListComponent.ts index b0c30a985d..0f97733fbe 100644 --- a/src/js/stendhal/ui/component/StatusesListComponent.ts +++ b/src/js/stendhal/ui/component/StatusesListComponent.ts @@ -12,6 +12,7 @@ import { Component } from "../toolkit/Component"; import { User } from "../../entity/User"; +import { Paths } from "../../data/Paths"; declare var stendhal: any; @@ -65,9 +66,9 @@ export class StatusesListComponent extends Component { } let iconPath: string; if (Object.keys(StatusesListComponent.iconPaths).indexOf(id) !== -1) { - iconPath = stendhal.paths.sprites + StatusesListComponent.iconPaths[id]; + iconPath = Paths.sprites + StatusesListComponent.iconPaths[id]; } else { - iconPath = stendhal.paths.sprites + "/status/panel/" + id + ".png"; + iconPath = Paths.sprites + "/status/panel/" + id + ".png"; } const icon = stendhal.data.sprites.get(iconPath); icon.className = "status-icon"; diff --git a/src/js/stendhal/ui/dialog/EmojiMapDialog.ts b/src/js/stendhal/ui/dialog/EmojiMapDialog.ts index 9fab015c4d..37044a9c77 100644 --- a/src/js/stendhal/ui/dialog/EmojiMapDialog.ts +++ b/src/js/stendhal/ui/dialog/EmojiMapDialog.ts @@ -11,6 +11,7 @@ import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { singletons } from "../../SingletonRepo"; +import { Paths } from "../../data/Paths"; declare var marauroa: any; declare var stendhal: any; @@ -83,7 +84,7 @@ export class EmojiMapDialog extends DialogContentComponent { const button = document.createElement("button"); button.classList.add("shortcut-button", "emoji-text"); if (!this.sysEmojis) { - button.appendChild(stendhal.data.sprites.get(stendhal.paths.sprites + "/emoji/" + emoji + ".png").cloneNode()); + button.appendChild(stendhal.data.sprites.get(Paths.sprites + "/emoji/" + emoji + ".png").cloneNode()); } else { button.innerText = emoji; } diff --git a/src/js/stendhal/ui/dialog/TravelLogDialog.ts b/src/js/stendhal/ui/dialog/TravelLogDialog.ts index 54e035f2c4..a273fce417 100644 --- a/src/js/stendhal/ui/dialog/TravelLogDialog.ts +++ b/src/js/stendhal/ui/dialog/TravelLogDialog.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { Paths } from "../../data/Paths"; import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { ui } from "../UI"; import { UIComponentEnum } from "../UIComponentEnum"; @@ -167,7 +168,7 @@ export class TravelLogDialog extends DialogContentComponent { detailsSpan.innerHTML = "

    " + stendhal.ui.html.esc(selectedItem) + "

    "; if (this.repeatable[selectedItem]) { detailsSpan.innerHTML += "

    " - + " I can do this quest again.

    "; + + " I can do this quest again.

    "; } detailsSpan.innerHTML += "

    " diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts index d28cee65ba..5c403739e2 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { Paths } from "../../../data/Paths"; import { RenderingContext2D } from "util/Types"; declare var stendhal: any; @@ -106,7 +107,7 @@ export class OutfitPartSelector { // FIXME: need to draw "busty" dress variants for body index 1 - const fname = stendhal.paths.sprites + "/outfit/" + part + "/" + this.indexString(index) + suffix; + const fname = Paths.sprites + "/outfit/" + part + "/" + this.indexString(index) + suffix; if (color != null) { return stendhal.data.sprites.getFilteredWithPromise(fname, "trueColor", color); } diff --git a/src/js/stendhal/ui/joystick/JoystickImpl.ts b/src/js/stendhal/ui/joystick/JoystickImpl.ts index 4eb84aea71..6fb079f445 100644 --- a/src/js/stendhal/ui/joystick/JoystickImpl.ts +++ b/src/js/stendhal/ui/joystick/JoystickImpl.ts @@ -15,6 +15,7 @@ declare var stendhal: any; import { ui } from "../UI"; import { SoftwareJoystickController } from "../SoftwareJoystickController"; import { Direction } from "../../util/Direction"; +import { Paths } from "../../data/Paths"; /** @@ -62,7 +63,7 @@ export abstract class JoystickImpl { * Path to image. */ public static getResource(basename: string): string { - return stendhal.paths.gui + "/joystick/" + basename + ".png"; + return Paths.gui + "/joystick/" + basename + ".png"; } /** diff --git a/src/js/stendhal/util/ConfigManager.ts b/src/js/stendhal/util/ConfigManager.ts index 8b86302618..18caf0eb24 100644 --- a/src/js/stendhal/util/ConfigManager.ts +++ b/src/js/stendhal/util/ConfigManager.ts @@ -17,6 +17,7 @@ import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { BuddyListComponent } from "../ui/component/BuddyListComponent"; +import { Paths } from "../data/Paths"; /** @@ -525,7 +526,7 @@ export class ConfigManager { applyTheme(element: HTMLElement, children=false, recurse=false, updateBG=false) { const current = this.getTheme(); element.style.setProperty("background", - "url(" + stendhal.paths.gui + "/" + this.themes.map[current] + ")"); + "url(" + Paths.gui + "/" + this.themes.map[current] + ")"); // make texts readable with dark & light themes let color = "#000000"; @@ -564,7 +565,7 @@ export class ConfigManager { let rootStyle = document.documentElement.style; rootStyle.setProperty("--background-url", - "url(" + stendhal.paths.gui + "/" + this.themes.map[current] + ")"); + "url(" + Paths.gui + "/" + this.themes.map[current] + ")"); if (this.usingDarkTheme()) { rootStyle.setProperty("--text-color", "#fff"); rootStyle.setProperty("--text-color-inactive", "#aaa"); diff --git a/src/js/stendhal/util/Nature.ts b/src/js/stendhal/util/Nature.ts index 01be2b1e22..a0a2c944db 100644 --- a/src/js/stendhal/util/Nature.ts +++ b/src/js/stendhal/util/Nature.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { Paths } from "../data/Paths"; /** @@ -47,7 +47,7 @@ export class Nature { * Sprite path. */ getWeaponPath(weapon: string): string { - let path = stendhal.paths.sprites + "/combat/" + weapon; + let path = Paths.sprites + "/combat/" + weapon; if (typeof(this.elem) !== "undefined") { path += "_" + this.elem; } diff --git a/src/js/stendhal/util/SessionManager.ts b/src/js/stendhal/util/SessionManager.ts index 24d36cb455..456e2bbf63 100644 --- a/src/js/stendhal/util/SessionManager.ts +++ b/src/js/stendhal/util/SessionManager.ts @@ -9,6 +9,8 @@ * * ***************************************************************************/ +import { Paths } from "../data/Paths"; + declare var stendhal: any; @@ -197,7 +199,7 @@ export class SessionManager { * `true` if data path root is set to "/testdata". */ isTestClient(): boolean { - return stendhal.paths.data === "/testdata"; + return Paths.data === "/testdata"; } /** diff --git a/src/js/stendhal/util/WeatherRenderer.ts b/src/js/stendhal/util/WeatherRenderer.ts index 096144e223..a35a3dd137 100644 --- a/src/js/stendhal/util/WeatherRenderer.ts +++ b/src/js/stendhal/util/WeatherRenderer.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { Paths } from "../data/Paths"; import { TileStore } from "../data/TileStore"; import { SoundObject } from "../data/sound/SoundFactory"; @@ -108,7 +109,7 @@ export class WeatherRenderer { if (!weather) { this.sprite = undefined; } else { - const img = stendhal.paths.weather + "/" + weather + ".png"; + const img = Paths.weather + "/" + weather + ".png"; this.sprite = stendhal.data.sprites.get(img); /* FIXME: * "TypeError: $stendhal$$.data.$tileset$.$weatherAnimationMap$ From c38740eaabbfe038caa24e7b9520f68ca9fadcae Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Thu, 1 Jan 2026 18:24:56 -0800 Subject: [PATCH 038/162] Use 'versionName' instead of 'versionCode' in Android output filename --- app/android/client/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/android/client/build.gradle b/app/android/client/build.gradle index 6fa80a9a75..dcff5114b2 100644 --- a/app/android/client/build.gradle +++ b/app/android/client/build.gradle @@ -26,7 +26,7 @@ android { } // build output - project.setProperty("archivesBaseName", "${namespace}-${defaultConfig.versionCode}") + project.setProperty("archivesBaseName", "${namespace}-${defaultConfig.versionName}") project.setProperty("buildDir", "${projectDir}/../../../build/build_android_client") /* A keystore.properties file can be placed in the root Android project directory and must From 6224a0638ad9f70285a3ee4493d2e27a945565d6 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Thu, 1 Jan 2026 18:31:27 -0800 Subject: [PATCH 039/162] Run 'ant init' to update copyright year --- README.md | 2 +- buildtools/mkdocs/mkdocs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 63698cdffc..9655013187 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,6 @@ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE [LICENSE.txt](LICENSE.txt) and [src/js/LICENSE.html](src/js/LICENSE.html) file for more details. Stendhal(c) is copyright of Miguel Angel Blanch Lardin, 2005-2008, arianne_rpg at users dot sourceforge dot net and others
    -Stendhal(c) is copyright of the Arianne Project, 2006-2025, arianne-general at lists dot sourceforge dot net +Stendhal(c) is copyright of the Arianne Project, 2006-2026, arianne-general at lists dot sourceforge dot net Please have a look at the list of [contributors](doc/contributors.md#contributors). diff --git a/buildtools/mkdocs/mkdocs.yml b/buildtools/mkdocs/mkdocs.yml index 1483f53630..205e9d758c 100644 --- a/buildtools/mkdocs/mkdocs.yml +++ b/buildtools/mkdocs/mkdocs.yml @@ -1,6 +1,6 @@ site_name: Stendhal 1.48.5 Reference Documentation site_description: A fun, friendly, & free multiplayer online adventure game. -copyright: Copyright © 2003-2025 Stendhal +copyright: Copyright © 2003-2026 Stendhal site_url: https://stendhalgame.org/ nav: - Index: /reference/ From 8f642ac4461886a4f3e2f9bea533f8d0ecdc2edb Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Thu, 1 Jan 2026 18:33:01 -0800 Subject: [PATCH 040/162] Increment version to 1.49.5 --- app/android/client/build.gradle | 4 ++-- app/android/client/src/main/res/values/strings.xml | 2 +- app/neutralinojs/neutralino.config.json | 2 +- bin/runserver.bat | 2 +- bin/runserver.sh | 2 +- build.ant.properties | 6 +++--- buildtools/mkdocs/mkdocs.yml | 2 +- src/games/stendhal/client/update/HttpClient.java | 2 +- src/games/stendhal/common/Debug.java | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/android/client/build.gradle b/app/android/client/build.gradle index dcff5114b2..d5f56cb075 100644 --- a/app/android/client/build.gradle +++ b/app/android/client/build.gradle @@ -10,8 +10,8 @@ android { applicationId namespace minSdk 21 targetSdk 32 - versionCode 1048005 - versionName "1.48.5" + versionCode 1049005 + versionName "1.49.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" targetSdkVersion 32 minSdkVersion 21 diff --git a/app/android/client/src/main/res/values/strings.xml b/app/android/client/src/main/res/values/strings.xml index fe759d152f..f60bf90f42 100644 --- a/app/android/client/src/main/res/values/strings.xml +++ b/app/android/client/src/main/res/values/strings.xml @@ -5,6 +5,6 @@ Stendhal stendhalprod8gps5y99pu prod - 1.48.5 + 1.49.5 diff --git a/app/neutralinojs/neutralino.config.json b/app/neutralinojs/neutralino.config.json index 5113267710..7d4ac4d423 100644 --- a/app/neutralinojs/neutralino.config.json +++ b/app/neutralinojs/neutralino.config.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/neutralinojs/neutralinojs/main/schemas/neutralino.config.schema.json", "applicationId": "org.stendhalgame.client", - "version": "1.48.5", + "version": "1.49.5", "defaultMode": "window", "port": 0, "documentRoot": "/resources/", diff --git a/bin/runserver.bat b/bin/runserver.bat index a6d9623195..91d06c7e74 100644 --- a/bin/runserver.bat +++ b/bin/runserver.bat @@ -1,6 +1,6 @@ @echo off -set STENDHAL_VERSION=1.48.5 +set STENDHAL_VERSION=1.49.5 set SERVER_JAR=stendhal-server-%STENDHAL_VERSION%.jar :: change to server directory diff --git a/bin/runserver.sh b/bin/runserver.sh index 1a2e475093..6dbe08452d 100755 --- a/bin/runserver.sh +++ b/bin/runserver.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -STENDHAL_VERSION="1.48.5" +STENDHAL_VERSION="1.49.5" SERVER_JAR="stendhal-server-${STENDHAL_VERSION}.jar" # change to server directory diff --git a/build.ant.properties b/build.ant.properties index 427f93c1f9..fb5e66018b 100644 --- a/build.ant.properties +++ b/build.ant.properties @@ -91,10 +91,10 @@ updates_server_fallback = http://arianne.sourceforge.net/stendhal/updates version_server = http://arianne.sourceforge.net/stendhal.version # current version of stendhal -version.old = 1.48 -version = 1.48.5 +version.old = 1.49 +version = 1.49.5 # FIXME: dynamic method to set this property? -version.android = 1048005 +version.android = 1049005 # javac options javac.deprecation = true diff --git a/buildtools/mkdocs/mkdocs.yml b/buildtools/mkdocs/mkdocs.yml index 205e9d758c..b73584a76f 100644 --- a/buildtools/mkdocs/mkdocs.yml +++ b/buildtools/mkdocs/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Stendhal 1.48.5 Reference Documentation +site_name: Stendhal 1.49.5 Reference Documentation site_description: A fun, friendly, & free multiplayer online adventure game. copyright: Copyright © 2003-2026 Stendhal site_url: https://stendhalgame.org/ diff --git a/src/games/stendhal/client/update/HttpClient.java b/src/games/stendhal/client/update/HttpClient.java index f4143f3956..5cb0b66690 100644 --- a/src/games/stendhal/client/update/HttpClient.java +++ b/src/games/stendhal/client/update/HttpClient.java @@ -118,7 +118,7 @@ public class HttpClient { try { connection = (HttpURLConnection) url.openConnection(); // Wikipedia API now requires User-Agent string - connection.setRequestProperty("User-Agent", "StendhalClient/1.48.5 (https://arianne-project.org/contact.html)"); + connection.setRequestProperty("User-Agent", "StendhalClient/1.49.5 (https://arianne-project.org/contact.html)"); connection.setConnectTimeout(myTimeout); connection.setInstanceFollowRedirects(true); connection.setUseCaches(false); diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java index 9ff2b7ed8f..02e0f91f7b 100644 --- a/src/games/stendhal/common/Debug.java +++ b/src/games/stendhal/common/Debug.java @@ -26,7 +26,7 @@ public class Debug { /** version. */ // Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line. - public static final String VERSION = "1.48.5"; + public static final String VERSION = "1.49.5"; /** pre release suffix */ // Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line. From f1d98fff5615d7a0618e4c2946a10c393a57e322 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 2 Jan 2026 04:10:44 +0100 Subject: [PATCH 041/162] access SpriteStore via singletons instead of stendhal-variable --- src/js/stendhal/action/DebugAction.ts | 2 +- src/js/stendhal/data/EmojiStore.ts | 5 +- src/js/stendhal/data/Outfit.ts | 15 ++-- src/js/stendhal/data/SpriteStore.ts | 7 +- src/js/stendhal/entity/Corpse.ts | 3 +- src/js/stendhal/entity/DomesticAnimal.ts | 4 +- src/js/stendhal/entity/Door.ts | 5 +- src/js/stendhal/entity/Entity.ts | 3 +- src/js/stendhal/entity/EntityRegistry.ts | 84 ++++++++++--------- src/js/stendhal/entity/Food.ts | 4 +- src/js/stendhal/entity/Gate.ts | 4 +- .../stendhal/entity/GrowingEntitySpawner.ts | 4 +- src/js/stendhal/entity/Item.ts | 11 ++- src/js/stendhal/entity/RPEntity.ts | 36 ++++---- src/js/stendhal/entity/Sign.ts | 3 +- src/js/stendhal/event/ShowItemListEvent.ts | 3 +- src/js/stendhal/sprite/AchievementBanner.ts | 5 +- .../sprite/ActivityIndicatorSprite.ts | 3 +- src/js/stendhal/sprite/NotificationBubble.ts | 5 +- .../sprite/action/MeleeAttackSprite.ts | 9 +- .../sprite/action/RangedAttackSprite.ts | 3 +- src/js/stendhal/ui/ViewPort.ts | 4 +- .../ui/component/ChatInputComponent.ts | 2 +- .../component/ItemContainerImplementation.ts | 4 +- .../ui/component/StatusesListComponent.ts | 5 +- src/js/stendhal/ui/dialog/EmojiMapDialog.ts | 2 +- .../ui/dialog/outfit/OutfitColorSelector.ts | 17 ++-- .../outfit/OutfitPaletteColorSelector.ts | 16 ++-- .../ui/dialog/outfit/OutfitPartSelector.ts | 5 +- src/js/stendhal/util/WeatherRenderer.ts | 3 +- 30 files changed, 144 insertions(+), 132 deletions(-) diff --git a/src/js/stendhal/action/DebugAction.ts b/src/js/stendhal/action/DebugAction.ts index 648664b972..81cfcda0a7 100644 --- a/src/js/stendhal/action/DebugAction.ts +++ b/src/js/stendhal/action/DebugAction.ts @@ -140,7 +140,7 @@ export class DebugAction extends SlashAction { if (weather) { weather = weather.replace(/ /g, "_"); const wfilename = Paths.weather + "/" + weather + ".png"; - if (!stendhal.data.sprites.getCached(wfilename)) { + if (!singletons.getSpriteStore().getCached(wfilename)) { Chat.logH("error", "unknown weather: " + wfilename); return; } diff --git a/src/js/stendhal/data/EmojiStore.ts b/src/js/stendhal/data/EmojiStore.ts index 78a72e5e85..f526c78584 100644 --- a/src/js/stendhal/data/EmojiStore.ts +++ b/src/js/stendhal/data/EmojiStore.ts @@ -11,8 +11,7 @@ import { Paths } from "./Paths"; import { JSONLoader } from "../util/JSONLoader"; - -declare var stendhal: any; +import { singletons } from "../SingletonRepo"; export class EmojiStore { @@ -71,7 +70,7 @@ export class EmojiStore { if (!filename) { return; } - return stendhal.data.sprites.get(filename); + return singletons.getSpriteStore().get(filename); } /** diff --git a/src/js/stendhal/data/Outfit.ts b/src/js/stendhal/data/Outfit.ts index 15010fd80a..680f6dbc11 100644 --- a/src/js/stendhal/data/Outfit.ts +++ b/src/js/stendhal/data/Outfit.ts @@ -10,10 +10,12 @@ * * ***************************************************************************/ +import { singletons } from "../SingletonRepo"; import { DrawingStage } from "../util/DrawingStage"; import { Pair } from "../util/Pair"; import { StringUtil } from "../util/StringUtil"; import { Paths } from "./Paths"; +import { SpriteImage } from "../data/SpriteStore"; declare var stendhal: any; @@ -201,7 +203,7 @@ export class Outfit { toImage(callback: Function) { const sig = this.getSignature(); // get directly from cache since we don't want to return failsafe image - let image: HTMLImageElement = stendhal.data.sprites.getCached(sig); + let image: SpriteImage = singletons.getSpriteStore().getCached(sig); const onReady = function(e?: Event) { image.removeEventListener("load", onReady); @@ -245,14 +247,14 @@ export class Outfit { layerPath += ".png"; const coloring = this.getLayerColor(layerName); if (typeof(coloring) === "undefined") { - layers.push(stendhal.data.sprites.get(layerPath)); + layers.push(singletons.getSpriteStore().get(layerPath)); } else { - layers.push(stendhal.data.sprites.getFiltered(layerPath, "trueColor", coloring)); + layers.push(singletons.getSpriteStore().getFiltered(layerPath, "trueColor", coloring)); } } if (layers.length == 0) { - image = stendhal.data.sprites.getFailsafe(); + image = singletons.getSpriteStore().getFailsafe() as SpriteImage; callback(image); return; } @@ -272,9 +274,10 @@ export class Outfit { layer.removeEventListener("load", onLayerReady); stage.drawImage(layer); } - image = stage.toImage(); + image = stage.toImage() as SpriteImage; stage.reset(); - stendhal.data.sprites.cache(sig, image); + image.counter = 1; + singletons.getSpriteStore().cache(sig, image); if (image.height > 0) { onReady(); } else { diff --git a/src/js/stendhal/data/SpriteStore.ts b/src/js/stendhal/data/SpriteStore.ts index 2f260c89b4..8260e44f0a 100644 --- a/src/js/stendhal/data/SpriteStore.ts +++ b/src/js/stendhal/data/SpriteStore.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2024 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -11,11 +11,10 @@ declare var stendhal: any; -import { Canvas } from "util/Types"; import { Paths } from "./Paths"; -class SpriteImage extends Image { +export class SpriteImage extends Image { // number of times the image has been accessed after initial creation counter = 0; } @@ -60,7 +59,7 @@ export class SpriteStore { }; // TODO: move to animation.json - private animations: {[key: string]: any} = { + animations: {[key: string]: any} = { idea: { "love": {delay: 100, offsetX: 24, offsetY: -8} } diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index 18b16292aa..3c20855e20 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -19,6 +19,7 @@ import { Chat } from "../util/Chat"; import { PopupInventory } from "./PopupInventory"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare var marauroa: any; declare var stendhal: any; @@ -62,7 +63,7 @@ export class Corpse extends PopupInventory { const tileW = stendhal.ui.gamewindow.targetTileWidth; const tileH = stendhal.ui.gamewindow.targetTileHeight; if (this.sprite.width == undefined || this.sprite.height == undefined) { - const image = stendhal.data.sprites.get(this.sprite.filename); + const image = singletons.getSpriteStore().get(this.sprite.filename); if (image.complete) { this.sprite.width = image.width < tileW ? tileW : image.width; this.sprite.height = image.height < tileH ? tileH : image.height; diff --git a/src/js/stendhal/entity/DomesticAnimal.ts b/src/js/stendhal/entity/DomesticAnimal.ts index 9de58f8730..2dcd199cbb 100644 --- a/src/js/stendhal/entity/DomesticAnimal.ts +++ b/src/js/stendhal/entity/DomesticAnimal.ts @@ -15,9 +15,9 @@ import { MenuItem} from "../action/MenuItem"; import { Color } from "../data/color/Color"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare var marauroa: any; -declare var stendhal: any; export class DomesticAnimal extends RPEntity { @@ -34,7 +34,7 @@ export class DomesticAnimal extends RPEntity { var localX = this["_x"] * 32; var localY = this["_y"] * 32; - var image = stendhal.data.sprites.get(this.imagePath); + var image = singletons.getSpriteStore().get(this.imagePath); if (image.height) { var nFrames = 3; var nDirections = 4; diff --git a/src/js/stendhal/entity/Door.ts b/src/js/stendhal/entity/Door.ts index b7577b5b8f..c677e4dbe4 100644 --- a/src/js/stendhal/entity/Door.ts +++ b/src/js/stendhal/entity/Door.ts @@ -13,8 +13,7 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Portal } from "./Portal"; import { Paths } from "../data/Paths"; - -declare var stendhal: any; +import { singletons } from "../SingletonRepo"; export class Door extends Portal { @@ -22,7 +21,7 @@ export class Door extends Portal { override draw(ctx: RenderingContext2D) { let imagePath = Paths.sprites + "/doors/" + this["class"] + ".png"; - let image = stendhal.data.sprites.get(imagePath); + let image = singletons.getSpriteStore().get(imagePath); if (image.height) { let height = image.height / 2; let x = (this["x"] * 32) - ((image.width - 32) / 2); diff --git a/src/js/stendhal/entity/Entity.ts b/src/js/stendhal/entity/Entity.ts index 9f02254fd4..c61ffc3703 100644 --- a/src/js/stendhal/entity/Entity.ts +++ b/src/js/stendhal/entity/Entity.ts @@ -14,6 +14,7 @@ import { MenuItem } from "../action/MenuItem"; import { Chat } from "../util/Chat"; import { RPObject } from "./RPObject"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare var marauroa: any; declare var stendhal: any; @@ -220,7 +221,7 @@ export class Entity extends RPObject { } drawSpriteAt(ctx: RenderingContext2D, x: number, y: number) { - var image = stendhal.data.sprites.get(this.sprite.filename); + var image = singletons.getSpriteStore().get(this.sprite.filename); if (image.height) { var offsetX = this.sprite.offsetX || 0; var offsetY = this.sprite.offsetY || 0; diff --git a/src/js/stendhal/entity/EntityRegistry.ts b/src/js/stendhal/entity/EntityRegistry.ts index 535792b188..8b6ff19327 100644 --- a/src/js/stendhal/entity/EntityRegistry.ts +++ b/src/js/stendhal/entity/EntityRegistry.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -35,41 +35,47 @@ import { User } from "./User"; import { VisibleEntity } from "./VisibleEntity"; import { WalkBlocker } from "./WalkBlocker"; -marauroa.rpobjectFactory["area"] = InvisibleEntity; -marauroa.rpobjectFactory["baby_dragon"] = DomesticAnimal; -marauroa.rpobjectFactory["blackboard"] = Sign; -marauroa.rpobjectFactory["blocktarget"] = InvisibleEntity; -marauroa.rpobjectFactory["block"] = VisibleEntity; -marauroa.rpobjectFactory["blood"] = Blood; -marauroa.rpobjectFactory["cat"] = DomesticAnimal; -marauroa.rpobjectFactory["chest"] = Chest; -marauroa.rpobjectFactory["corpse"] = Corpse; -marauroa.rpobjectFactory["creature"] = Creature; -marauroa.rpobjectFactory["_default"] = UnknownEntity; -marauroa.rpobjectFactory["domesticanimal"] = DomesticAnimal; -marauroa.rpobjectFactory["door"] = Door; -marauroa.rpobjectFactory["flyover"] = InvisibleEntity; -marauroa.rpobjectFactory["food"] = Food; -marauroa.rpobjectFactory["game_board"] = GameBoard; -marauroa.rpobjectFactory["gate"] = Gate -marauroa.rpobjectFactory["growing_entity_spawner"] = GrowingEntitySpawner; -marauroa.rpobjectFactory["house_portal"] = Portal; -marauroa.rpobjectFactory["invisible_entity"] = InvisibleEntity; -marauroa.rpobjectFactory["item"] = Item; -marauroa.rpobjectFactory["looped_sound_source"] = LoopedSoundSource; -marauroa.rpobjectFactory["npc"] = NPC; -marauroa.rpobjectFactory["plant_grower"] = VisibleEntity; -marauroa.rpobjectFactory["player"] = Player; -marauroa.rpobjectFactory["portal"] = Portal; -marauroa.rpobjectFactory["rented_sign"] = Sign; -marauroa.rpobjectFactory["sheep"] = DomesticAnimal; -marauroa.rpobjectFactory["sign"] = Sign; -marauroa.rpobjectFactory["tiled_entity"] = InvisibleEntity; -marauroa.rpobjectFactory["training_dummy"] = TrainingDummy; -marauroa.rpobjectFactory["unknown"] = UnknownEntity; -marauroa.rpobjectFactory["useable_entity"] = UseableEntity; -marauroa.rpobjectFactory["user"] = User; -marauroa.rpobjectFactory["visible_entity"] = VisibleEntity; -marauroa.rpobjectFactory["walkblocker"] = WalkBlocker; -marauroa.rpobjectFactory["wall"] = InvisibleEntity; -marauroa.rpobjectFactory["weather_entity"] = InvisibleEntity; +export class EntityRegistry { + + public init() { + marauroa.rpobjectFactory["area"] = InvisibleEntity; + marauroa.rpobjectFactory["baby_dragon"] = DomesticAnimal; + marauroa.rpobjectFactory["blackboard"] = Sign; + marauroa.rpobjectFactory["blocktarget"] = InvisibleEntity; + marauroa.rpobjectFactory["block"] = VisibleEntity; + marauroa.rpobjectFactory["blood"] = Blood; + marauroa.rpobjectFactory["cat"] = DomesticAnimal; + marauroa.rpobjectFactory["chest"] = Chest; + marauroa.rpobjectFactory["corpse"] = Corpse; + marauroa.rpobjectFactory["creature"] = Creature; + marauroa.rpobjectFactory["_default"] = UnknownEntity; + marauroa.rpobjectFactory["domesticanimal"] = DomesticAnimal; + marauroa.rpobjectFactory["door"] = Door; + marauroa.rpobjectFactory["flyover"] = InvisibleEntity; + marauroa.rpobjectFactory["food"] = Food; + marauroa.rpobjectFactory["game_board"] = GameBoard; + marauroa.rpobjectFactory["gate"] = Gate + marauroa.rpobjectFactory["growing_entity_spawner"] = GrowingEntitySpawner; + marauroa.rpobjectFactory["house_portal"] = Portal; + marauroa.rpobjectFactory["invisible_entity"] = InvisibleEntity; + marauroa.rpobjectFactory["item"] = Item; + marauroa.rpobjectFactory["looped_sound_source"] = LoopedSoundSource; + marauroa.rpobjectFactory["npc"] = NPC; + marauroa.rpobjectFactory["plant_grower"] = VisibleEntity; + marauroa.rpobjectFactory["player"] = Player; + marauroa.rpobjectFactory["portal"] = Portal; + marauroa.rpobjectFactory["rented_sign"] = Sign; + marauroa.rpobjectFactory["sheep"] = DomesticAnimal; + marauroa.rpobjectFactory["sign"] = Sign; + marauroa.rpobjectFactory["tiled_entity"] = InvisibleEntity; + marauroa.rpobjectFactory["training_dummy"] = TrainingDummy; + marauroa.rpobjectFactory["unknown"] = UnknownEntity; + marauroa.rpobjectFactory["useable_entity"] = UseableEntity; + marauroa.rpobjectFactory["user"] = User; + marauroa.rpobjectFactory["visible_entity"] = VisibleEntity; + marauroa.rpobjectFactory["walkblocker"] = WalkBlocker; + marauroa.rpobjectFactory["wall"] = InvisibleEntity; + marauroa.rpobjectFactory["weather_entity"] = InvisibleEntity; + } +} + diff --git a/src/js/stendhal/entity/Food.ts b/src/js/stendhal/entity/Food.ts index 5e862a5acd..f37ada3b26 100644 --- a/src/js/stendhal/entity/Food.ts +++ b/src/js/stendhal/entity/Food.ts @@ -12,9 +12,9 @@ import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare var marauroa: any; -declare var stendhal: any; export class Food extends Entity { @@ -30,7 +30,7 @@ export class Food extends Entity { } override draw(ctx: RenderingContext2D) { - var image = stendhal.data.sprites.get(Paths.sprites + "/food.png"); + var image = singletons.getSpriteStore().get(Paths.sprites + "/food.png"); if (image.height) { var localX = this["x"] * 32; var localY = this["y"] * 32; diff --git a/src/js/stendhal/entity/Gate.ts b/src/js/stendhal/entity/Gate.ts index c01efc68f0..7da2051a50 100644 --- a/src/js/stendhal/entity/Gate.ts +++ b/src/js/stendhal/entity/Gate.ts @@ -13,9 +13,9 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare var marauroa: any; -declare var stendhal: any; export class Gate extends Entity { @@ -49,7 +49,7 @@ export class Gate extends Entity { override draw(ctx: RenderingContext2D) { if (this._image == undefined) { var filename = Paths.sprites + "/doors/" + this["image"] + "_" + this["orientation"] + ".png"; - this._image = stendhal.data.sprites.get(filename); + this._image = singletons.getSpriteStore().get(filename); } if (this._image.height) { var xOffset = -32 * Math.floor(this._image.width / 32 / 2); diff --git a/src/js/stendhal/entity/GrowingEntitySpawner.ts b/src/js/stendhal/entity/GrowingEntitySpawner.ts index e05edc09c4..d625826582 100644 --- a/src/js/stendhal/entity/GrowingEntitySpawner.ts +++ b/src/js/stendhal/entity/GrowingEntitySpawner.ts @@ -13,9 +13,9 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare var marauroa: any; -declare var stendhal: any; export class GrowingEntitySpawner extends Entity { @@ -66,7 +66,7 @@ export class GrowingEntitySpawner extends Entity { class_name = class_name.replace(" ", "_"); } - var image = stendhal.data.sprites.get(Paths.sprites + "/" + class_name + ".png"); + var image = singletons.getSpriteStore().get(Paths.sprites + "/" + class_name + ".png"); if (image.height) { // image.complete is true on missing image files var count = parseInt(this["max_ripeness"], 10) + 1; var drawHeight = image.height / count; diff --git a/src/js/stendhal/entity/Item.ts b/src/js/stendhal/entity/Item.ts index 0dd58ac5f6..27a338be8c 100644 --- a/src/js/stendhal/entity/Item.ts +++ b/src/js/stendhal/entity/Item.ts @@ -15,10 +15,9 @@ import { Entity } from "./Entity"; import { TextSprite } from "../sprite/TextSprite"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare var marauroa: any; -declare var stendhal: any; - export class Item extends Entity { @@ -147,12 +146,12 @@ export class Item extends Entity { } public isAnimated(): boolean { - if (!stendhal.data.sprites.get(this.sprite.filename).height) { + if (!singletons.getSpriteStore().get(this.sprite.filename).height) { return false; } if (this.animated == null) { // store animation state - this.animated = (stendhal.data.sprites.get(this.sprite.filename).width / 32) > 1; + this.animated = (singletons.getSpriteStore().get(this.sprite.filename).width / 32) > 1; } return this.animated; @@ -160,7 +159,7 @@ export class Item extends Entity { private setXFrameIndex(idx: number) { if (this.xFrames == null) { - const img = stendhal.data.sprites.get(this.sprite.filename); + const img = singletons.getSpriteStore().get(this.sprite.filename); this.xFrames = img.width / 32; } @@ -174,7 +173,7 @@ export class Item extends Entity { private setYFrameIndex(idx: number) { if (this.yFrames == null) { - const img = stendhal.data.sprites.get(this.sprite.filename); + const img = singletons.getSpriteStore().get(this.sprite.filename); this.yFrames = img.height / 32; } diff --git a/src/js/stendhal/entity/RPEntity.ts b/src/js/stendhal/entity/RPEntity.ts index 9c9b7f5f40..a75cc876f0 100644 --- a/src/js/stendhal/entity/RPEntity.ts +++ b/src/js/stendhal/entity/RPEntity.ts @@ -246,7 +246,7 @@ export class RPEntity extends ActiveEntity { if (stendhal.config.getBoolean("effect.shadows") && this.castsShadow()) { // dressed entities should use 48x64 sprites // FIXME: this will not display correctly for horse outfit - const shadow = stendhal.data.sprites.getShadow("48x64"); + const shadow = singletons.getSpriteStore().getShadow("48x64"); if (shadow && shadow.complete && shadow.height) { // draw shadow below other layers @@ -322,9 +322,9 @@ export class RPEntity extends ActiveEntity { colorname = part; } if (typeof(colors) !== "undefined" && (typeof(colors[colorname]) !== "undefined")) { - return stendhal.data.sprites.getFiltered(filename, "trueColor", colors[colorname]); + return singletons.getSpriteStore().getFiltered(filename, "trueColor", colors[colorname]); } else { - return stendhal.data.sprites.get(filename); + return singletons.getSpriteStore().get(filename); } } @@ -369,13 +369,13 @@ export class RPEntity extends ActiveEntity { } // check for safe image - if (!stendhal.config.getBoolean("effect.blood") && stendhal.data.sprites.hasSafeImage(filename)) { + if (!stendhal.config.getBoolean("effect.blood") && singletons.getSpriteStore().hasSafeImage(filename)) { filename = filename + "-safe.png"; } else { filename = filename + ".png"; } - let image = stendhal.data.sprites.get(filename); + let image = singletons.getSpriteStore().get(filename); if (stendhal.config.getBoolean("effect.shadows") && this.castsShadow()) { // check for configured shadow style @@ -385,7 +385,7 @@ export class RPEntity extends ActiveEntity { shadow_style = (image.width / 3) + "x" + (image.height / 4); } - const shadow = stendhal.data.sprites.getShadow(shadow_style); + const shadow = singletons.getSpriteStore().getShadow(shadow_style); // draw shadow first if (typeof(shadow) !== "undefined") { @@ -405,14 +405,14 @@ export class RPEntity extends ActiveEntity { ctx.drawImage(icon, frame * xdim, 0, xdim, ydim, x, y, xdim, ydim); } function drawAnimatedIcon(iconPath: string, delay: number, x: number, y: number, fWidth?: number) { - var icon = stendhal.data.sprites.get(iconPath); + var icon = singletons.getSpriteStore().get(iconPath); var dimH = icon.height; var dimW = typeof(fWidth) !== "undefined" ? fWidth : dimH; var nFrames = icon.width / dimW; _drawAnimatedIcon(icon, delay, nFrames, dimW, dimH, x, y); } function drawAnimatedIconWithFrames(iconPath: string, nFrames: number, delay: number, x: number, y: number) { - var icon = stendhal.data.sprites.get(iconPath); + var icon = singletons.getSpriteStore().get(iconPath); var ydim = icon.height; var xdim = icon.width / nFrames; _drawAnimatedIcon(icon, delay, nFrames, xdim, ydim, x, y); @@ -421,19 +421,19 @@ export class RPEntity extends ActiveEntity { var x = this["_x"] * 32 - 10; var y = (this["_y"] + 1) * 32; if (this.hasOwnProperty("choking")) { - ctx.drawImage(stendhal.data.sprites.get(Paths.sprites + "/ideas/choking.png"), x, y - 10); + ctx.drawImage(singletons.getSpriteStore().get(Paths.sprites + "/ideas/choking.png"), x, y - 10); } else if (this.hasOwnProperty("eating")) { - ctx.drawImage(stendhal.data.sprites.get(Paths.sprites + "/ideas/eat.png"), x, y - 10); + ctx.drawImage(singletons.getSpriteStore().get(Paths.sprites + "/ideas/eat.png"), x, y - 10); } // NPC and pet idea icons if (this.hasOwnProperty("idea")) { const idea = Paths.sprites + "/ideas/" + this["idea"] + ".png"; - const ani = stendhal.data.sprites.animations.idea[this["idea"]]; + const ani = singletons.getSpriteStore().animations.idea[this["idea"]]; if (ani) { drawAnimatedIcon(idea, ani.delay, x + ani.offsetX * this["width"], y - this["drawHeight"] + ani.offsetY); } else { - ctx.drawImage(stendhal.data.sprites.get(idea), x + 32 * this["width"], + ctx.drawImage(singletons.getSpriteStore().get(idea), x + 32 * this["width"], y - this["drawHeight"]); } } @@ -459,15 +459,15 @@ export class RPEntity extends ActiveEntity { // NPC job icons let nextX = x; if (this.hasOwnProperty("job_healer")) { - ctx.drawImage(stendhal.data.sprites.get(Paths.sprites + "/status/healer.png"), nextX, y - 10); + ctx.drawImage(singletons.getSpriteStore().get(Paths.sprites + "/status/healer.png"), nextX, y - 10); nextX += 12; } if (this.hasOwnProperty("job_merchant")) { - ctx.drawImage(stendhal.data.sprites.get(Paths.sprites + "/status/merchant.png"), nextX, y - 10); + ctx.drawImage(singletons.getSpriteStore().get(Paths.sprites + "/status/merchant.png"), nextX, y - 10); nextX += 12; } if (this.hasOwnProperty("job_producer")) { - ctx.drawImage(stendhal.data.sprites.get(Paths.sprites + "/status/producer.png"), nextX, y - 16); + ctx.drawImage(singletons.getSpriteStore().get(Paths.sprites + "/status/producer.png"), nextX, y - 16); nextX += 16; } } @@ -784,7 +784,7 @@ export class RPEntity extends ActiveEntity { createResultIcon(imagePath: string) { return { initTime: Date.now(), - image: stendhal.data.sprites.get(imagePath), + image: singletons.getSpriteStore().get(imagePath), draw: function(ctx: RenderingContext2D, x: number, y: number) { ctx.drawImage(this.image, x, y); return (Date.now() - this.initTime > 1200); @@ -815,12 +815,12 @@ export class RPEntity extends ActiveEntity { const imagePath = Nature.VALUES[nature].getWeaponPath(weapon); /* if (weapon.startsWith("blade_strike")) { - this.attackSprite = new BarehandAttackSprite(this, stendhal.data.sprites.get(imagePath)); + this.attackSprite = new BarehandAttackSprite(this, singletons.getSpriteStore().get(imagePath)); } else { this.attackSprite = new MeleeAttackSprite(this, imagePath); } */ - this.attackSprite = new BarehandAttackSprite(this, stendhal.data.sprites.get(imagePath)); + this.attackSprite = new BarehandAttackSprite(this, singletons.getSpriteStore().get(imagePath)); } } diff --git a/src/js/stendhal/entity/Sign.ts b/src/js/stendhal/entity/Sign.ts index cde383aee3..a7640cb340 100644 --- a/src/js/stendhal/entity/Sign.ts +++ b/src/js/stendhal/entity/Sign.ts @@ -13,6 +13,7 @@ import { Entity } from "./Entity"; import { ActivityIndicatorSprite } from "../sprite/ActivityIndicatorSprite"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare var stendhal: any; @@ -38,7 +39,7 @@ export class Sign extends Entity { if (!this.imagePath) { this.imagePath = Paths.sprites + "/signs/" + this["class"] + ".png"; } - var image = stendhal.data.sprites.get(this.imagePath); + var image = singletons.getSpriteStore().get(this.imagePath); if (image.height) { var localX = this["x"] * 32; var localY = this["y"] * 32; diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts index 9bd77e7089..9744738e6d 100644 --- a/src/js/stendhal/event/ShowItemListEvent.ts +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -16,6 +16,7 @@ import { ui } from "../ui/UI"; import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; import { Chat } from "../util/Chat"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare var stendhal: any; @@ -94,7 +95,7 @@ export class ShowItemListEvent extends RPEvent { // Item (image) const itemCell = document.createElement("td"); itemCell.appendChild( - stendhal.data.sprites.get( + singletons.getSpriteStore().get( Paths.sprites + "/items/" + i.img ) ); diff --git a/src/js/stendhal/sprite/AchievementBanner.ts b/src/js/stendhal/sprite/AchievementBanner.ts index 12d2427b8f..5123635aeb 100644 --- a/src/js/stendhal/sprite/AchievementBanner.ts +++ b/src/js/stendhal/sprite/AchievementBanner.ts @@ -13,6 +13,7 @@ import { TextBubble } from "./TextBubble"; import { BackgroundPainter } from "../util/BackgroundPainter"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare const stendhal: any; @@ -34,9 +35,9 @@ export class AchievementBanner extends TextBubble { constructor(cat: string, title: string, desc: string) { super(desc); this.title = title; - const bg = stendhal.data.sprites.get(Paths.gui + "/banner_background.png"); + const bg = singletons.getSpriteStore().get(Paths.gui + "/banner_background.png"); this.banner = new BackgroundPainter(bg); - this.icon = stendhal.data.sprites.get(Paths.achievements + this.icon = singletons.getSpriteStore().get(Paths.achievements + "/" + cat.toLowerCase() + ".png"); /* keep achievements on the screen a bit longer since they diff --git a/src/js/stendhal/sprite/ActivityIndicatorSprite.ts b/src/js/stendhal/sprite/ActivityIndicatorSprite.ts index 14972fb703..a81a3358bb 100644 --- a/src/js/stendhal/sprite/ActivityIndicatorSprite.ts +++ b/src/js/stendhal/sprite/ActivityIndicatorSprite.ts @@ -11,6 +11,7 @@ import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; declare var stendhal: any; @@ -20,7 +21,7 @@ declare var stendhal: any; */ export class ActivityIndicatorSprite { - private static readonly img = stendhal.data.sprites.get(Paths.sprites + "/ideas/activity.png"); + private static readonly img = singletons.getSpriteStore().get(Paths.sprites + "/ideas/activity.png"); private frameIdx = 0; private lastFrameUpdate = 0; diff --git a/src/js/stendhal/sprite/NotificationBubble.ts b/src/js/stendhal/sprite/NotificationBubble.ts index 7c4e6d7d83..aa81d4b9d7 100644 --- a/src/js/stendhal/sprite/NotificationBubble.ts +++ b/src/js/stendhal/sprite/NotificationBubble.ts @@ -20,6 +20,7 @@ import { NotificationType } from "../util/NotificationType"; import { Speech } from "../util/Speech"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; +import { singletons } from "../SingletonRepo"; export class NotificationBubble extends TextBubble { @@ -134,10 +135,10 @@ export class NotificationBubble extends TextBubble { * Loads a profile image to be drawn with text. */ private loadProfileSprite() { - const img = stendhal.data.sprites.get(Paths.sprites + const img = singletons.getSpriteStore().get(Paths.sprites + "/npc/" + this.profileName + ".png"); if (img.complete && img.height) { - this.profile = stendhal.data.sprites.getAreaOf(img, 48, 48, 48, 128); + this.profile = singletons.getSpriteStore().getAreaOf(img, 48, 48, 48, 128); } } } diff --git a/src/js/stendhal/sprite/action/MeleeAttackSprite.ts b/src/js/stendhal/sprite/action/MeleeAttackSprite.ts index 8cdff51b67..a3a586325e 100644 --- a/src/js/stendhal/sprite/action/MeleeAttackSprite.ts +++ b/src/js/stendhal/sprite/action/MeleeAttackSprite.ts @@ -10,12 +10,11 @@ * * ***************************************************************************/ -declare var stendhal: any; - import { AttackSprite } from "./AttackSprite"; import { RPEntity } from "../../entity/RPEntity"; import { Direction } from "../../util/Direction"; import { RenderingContext2D } from "util/Types"; +import { singletons } from "../../SingletonRepo"; export class MeleeAttackSprite extends AttackSprite { @@ -46,10 +45,10 @@ export class MeleeAttackSprite extends AttackSprite { const rot = 90 * (this.dir.val - 1); imagePath = imagePath.replace(/\.png$/, ""); this.frames = [ - //~ stendhal.data.sprites.getRotated(imagePath + "_rot45.png", rot-90), + //~ singletons.getSpriteStore().getRotated(imagePath + "_rot45.png", rot-90), undefined, - stendhal.data.sprites.getRotated(imagePath + ".png", rot), - //~ stendhal.data.sprites.getRotated(imagePath + "_rot45.png", rot) + singletons.getSpriteStore().getRotated(imagePath + ".png", rot), + //~ singletons.getSpriteStore().getRotated(imagePath + "_rot45.png", rot) undefined ]; if (this.frames[1].complete) { diff --git a/src/js/stendhal/sprite/action/RangedAttackSprite.ts b/src/js/stendhal/sprite/action/RangedAttackSprite.ts index 4323a90384..119dd59cf6 100644 --- a/src/js/stendhal/sprite/action/RangedAttackSprite.ts +++ b/src/js/stendhal/sprite/action/RangedAttackSprite.ts @@ -14,6 +14,7 @@ import { AttackSprite } from "./AttackSprite"; import { RPEntity } from "../../entity/RPEntity"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../../data/Paths"; +import { singletons } from "../../SingletonRepo"; declare var stendhal: any; @@ -24,7 +25,7 @@ export class RangedAttackSprite extends AttackSprite { private readonly targetX: number; private readonly targetY: number; private readonly color: string; - private readonly image = stendhal.data.sprites.get(Paths.sprites + "/combat/ranged.png"); + private readonly image = singletons.getSpriteStore().get(Paths.sprites + "/combat/ranged.png"); private readonly weapon?: string; diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index 3ac22fa449..758db5ddf5 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -654,14 +654,14 @@ export class ViewPort { var img = undefined; let heldObject: HeldObject; if (draggedEntity && draggedEntity.type === "item") { - img = stendhal.data.sprites.getAreaOf(stendhal.data.sprites.get(draggedEntity.sprite.filename), 32, 32); + img = singletons.getSpriteStore().getAreaOf(singletons.getSpriteStore().get(draggedEntity.sprite.filename), 32, 32); heldObject = { path: draggedEntity.getIdPath(), zone: marauroa.currentZoneName, quantity: draggedEntity.hasOwnProperty("quantity") ? draggedEntity["quantity"] : 1 } } else if (draggedEntity && draggedEntity.type === "corpse") { - img = stendhal.data.sprites.get(draggedEntity.sprite.filename); + img = singletons.getSpriteStore().get(draggedEntity.sprite.filename); heldObject = { path: draggedEntity.getIdPath(), zone: marauroa.currentZoneName, diff --git a/src/js/stendhal/ui/component/ChatInputComponent.ts b/src/js/stendhal/ui/component/ChatInputComponent.ts index df8c7254ae..8229ca0720 100644 --- a/src/js/stendhal/ui/component/ChatInputComponent.ts +++ b/src/js/stendhal/ui/component/ChatInputComponent.ts @@ -87,7 +87,7 @@ export class ChatInputComponent extends Component { btn_emoji.innerText = "☺"; } else { // set image for emoji button - btn_emoji.appendChild(stendhal.data.sprites.get(Paths.sprites + "/emoji/smile.png").cloneNode()); + btn_emoji.appendChild(singletons.getSpriteStore().get(Paths.sprites + "/emoji/smile.png").cloneNode()); } } diff --git a/src/js/stendhal/ui/component/ItemContainerImplementation.ts b/src/js/stendhal/ui/component/ItemContainerImplementation.ts index 5939106f3b..d22035e5d1 100644 --- a/src/js/stendhal/ui/component/ItemContainerImplementation.ts +++ b/src/js/stendhal/ui/component/ItemContainerImplementation.ts @@ -132,7 +132,7 @@ export class ItemContainerImplementation { } e.style.backgroundImage = "url(" - + stendhal.data.sprites.checkPath(Paths.sprites + + singletons.getSpriteStore().checkPath(Paths.sprites + "/items/" + o["class"] + "/" + o["subclass"] + ".png") + ")"; e.style.backgroundPosition = (xOffset+1) + "px " + (yOffset+1) + "px"; @@ -191,7 +191,7 @@ export class ItemContainerImplementation { quantity: item.hasOwnProperty("quantity") ? item["quantity"] : 1 }; - const img = stendhal.data.sprites.getAreaOf(stendhal.data.sprites.get(item.sprite.filename), 32, 32); + const img = singletons.getSpriteStore().getAreaOf(singletons.getSpriteStore().get(item.sprite.filename), 32, 32); if (event instanceof DragEvent && event.dataTransfer) { stendhal.ui.heldObject = heldObject; event.dataTransfer.setDragImage(img, 0, 0); diff --git a/src/js/stendhal/ui/component/StatusesListComponent.ts b/src/js/stendhal/ui/component/StatusesListComponent.ts index 0f97733fbe..f2676e29de 100644 --- a/src/js/stendhal/ui/component/StatusesListComponent.ts +++ b/src/js/stendhal/ui/component/StatusesListComponent.ts @@ -13,8 +13,7 @@ import { Component } from "../toolkit/Component"; import { User } from "../../entity/User"; import { Paths } from "../../data/Paths"; - -declare var stendhal: any; +import { singletons } from "../../SingletonRepo"; export class StatusesListComponent extends Component { @@ -70,7 +69,7 @@ export class StatusesListComponent extends Component { } else { iconPath = Paths.sprites + "/status/panel/" + id + ".png"; } - const icon = stendhal.data.sprites.get(iconPath); + const icon = singletons.getSpriteStore().get(iconPath); icon.className = "status-icon"; this.componentElement.appendChild(icon); } diff --git a/src/js/stendhal/ui/dialog/EmojiMapDialog.ts b/src/js/stendhal/ui/dialog/EmojiMapDialog.ts index 37044a9c77..046cef8264 100644 --- a/src/js/stendhal/ui/dialog/EmojiMapDialog.ts +++ b/src/js/stendhal/ui/dialog/EmojiMapDialog.ts @@ -84,7 +84,7 @@ export class EmojiMapDialog extends DialogContentComponent { const button = document.createElement("button"); button.classList.add("shortcut-button", "emoji-text"); if (!this.sysEmojis) { - button.appendChild(stendhal.data.sprites.get(Paths.sprites + "/emoji/" + emoji + ".png").cloneNode()); + button.appendChild(singletons.getSpriteStore().get(Paths.sprites + "/emoji/" + emoji + ".png").cloneNode()); } else { button.innerText = emoji; } diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts index 200d38d204..71dd029e7e 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts @@ -9,10 +9,9 @@ * * ***************************************************************************/ +import { singletons } from "../../../SingletonRepo"; import { Canvas, RenderingContext2D } from "util/Types"; -declare var stendhal: any; - export class OutfitColorSelector { protected ctx: RenderingContext2D; private gradCtx: RenderingContext2D; @@ -54,15 +53,15 @@ export class OutfitColorSelector { if (this.enabled) { const hsl = [this._x / this.baseImage.width, 1 - this._y / this.baseImage.height, this.hX / this.baseImage.width]; - const rgbArray = stendhal.data.sprites.filter.hsl2rgb(hsl); - return stendhal.data.sprites.filter.mergergb(rgbArray); + const rgbArray = singletons.getSpriteStore().filter.hsl2rgb(hsl); + return singletons.getSpriteStore().filter.mergergb(rgbArray); } return null; } set color(rgb) { if (rgb != null) { - const hsl = stendhal.data.sprites.filter.rgb2hsl(stendhal.data.sprites.filter.splitrgb(rgb)); + const hsl = singletons.getSpriteStore().filter.rgb2hsl(singletons.getSpriteStore().filter.splitrgb(rgb)); this._x = hsl[0] * this.baseImage.width; this._y = (1 - hsl[1]) * this.baseImage.height; this.hX = hsl[2] * this.baseImage.width; @@ -80,7 +79,7 @@ export class OutfitColorSelector { for (let x = 0; x < width; x++) { for (let y = 0; y < height; y++) { const hsl = [x / width, 1 - y / height, 0.5]; - const rgb = stendhal.data.sprites.filter.hsl2rgb(hsl); + const rgb = singletons.getSpriteStore().filter.hsl2rgb(hsl); ctx.fillStyle = this._rgbToCssString(rgb); ctx.fillRect(x, y, 1, 1); } @@ -142,9 +141,9 @@ export class OutfitColorSelector { const hslLeft = [this._x / width, 1 - this._y / height, 0.08]; const hslMiddle = [this._x / width, 1 - this._y / height, 0.5]; const hslRight = [this._x / width, 1 - this._y / height, 0.92]; - const rgbLeft = stendhal.data.sprites.filter.hsl2rgb(hslLeft); - const rgbMiddle = stendhal.data.sprites.filter.hsl2rgb(hslMiddle); - const rgbRight = stendhal.data.sprites.filter.hsl2rgb(hslRight); + const rgbLeft = singletons.getSpriteStore().filter.hsl2rgb(hslLeft); + const rgbMiddle = singletons.getSpriteStore().filter.hsl2rgb(hslMiddle); + const rgbRight = singletons.getSpriteStore().filter.hsl2rgb(hslRight); return [rgbLeft, rgbMiddle, rgbRight]; } diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts index fc21a76076..e8cdd76b70 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts @@ -9,9 +9,9 @@ * * ***************************************************************************/ +import { singletons } from "../../../SingletonRepo"; import { OutfitColorSelector } from "./OutfitColorSelector"; -declare var stendhal: any; export class OutfitPaletteColorSelector extends OutfitColorSelector { private _blockWidth: number; @@ -32,8 +32,8 @@ export class OutfitPaletteColorSelector extends OutfitColorSelector { if (this.enabled) { const hs = this._hsMap[Math.floor(this._x / this._blockWidth)][Math.floor(this._y / this._blockHeight)]; const hsl = [hs[0], hs[1], this.hX / this.baseImage.width]; - const rgbArray = stendhal.data.sprites.filter.hsl2rgb(hsl); - return stendhal.data.sprites.filter.mergergb(rgbArray); + const rgbArray = singletons.getSpriteStore().filter.hsl2rgb(hsl); + return singletons.getSpriteStore().filter.mergergb(rgbArray); } return null; } @@ -41,7 +41,7 @@ export class OutfitPaletteColorSelector extends OutfitColorSelector { override set color(rgb) { if (rgb != null) { this.enabled = true; - const hsl = stendhal.data.sprites.filter.rgb2hsl(stendhal.data.sprites.filter.splitrgb(rgb)); + const hsl = singletons.getSpriteStore().filter.rgb2hsl(singletons.getSpriteStore().filter.splitrgb(rgb)); this.hX = hsl[2] * this.baseImage.width; let bestDelta = Number.MAX_VALUE; for (let i = 0; i < 4; i++) { @@ -72,7 +72,7 @@ export class OutfitPaletteColorSelector extends OutfitColorSelector { const hue = hues[j]; const sat = saturations[i]; hsMap[i].push([hue, sat]); - const color = stendhal.data.sprites.filter.hsl2rgb([hue, sat, 0.5]); + const color = singletons.getSpriteStore().filter.hsl2rgb([hue, sat, 0.5]); colors[i].push(color); } } @@ -105,9 +105,9 @@ export class OutfitPaletteColorSelector extends OutfitColorSelector { const hslLeft = [hs[0], hs[1], 0.08]; const hslMiddle = [hs[0], hs[1], 0.5]; const hslRight = [hs[0], hs[1], 0.92]; - const rgbLeft = stendhal.data.sprites.filter.hsl2rgb(hslLeft); - const rgbMiddle = stendhal.data.sprites.filter.hsl2rgb(hslMiddle); - const rgbRight = stendhal.data.sprites.filter.hsl2rgb(hslRight); + const rgbLeft = singletons.getSpriteStore().filter.hsl2rgb(hslLeft); + const rgbMiddle = singletons.getSpriteStore().filter.hsl2rgb(hslMiddle); + const rgbRight = singletons.getSpriteStore().filter.hsl2rgb(hslRight); return [rgbLeft, rgbMiddle, rgbRight]; } diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts index 5c403739e2..c1095a3503 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { singletons } from "../../../SingletonRepo"; import { Paths } from "../../../data/Paths"; import { RenderingContext2D } from "util/Types"; @@ -109,8 +110,8 @@ export class OutfitPartSelector { const fname = Paths.sprites + "/outfit/" + part + "/" + this.indexString(index) + suffix; if (color != null) { - return stendhal.data.sprites.getFilteredWithPromise(fname, "trueColor", color); + return singletons.getSpriteStore().getFilteredWithPromise(fname, "trueColor", color); } - return stendhal.data.sprites.getWithPromise(fname); + return singletons.getSpriteStore().getWithPromise(fname); } } diff --git a/src/js/stendhal/util/WeatherRenderer.ts b/src/js/stendhal/util/WeatherRenderer.ts index a35a3dd137..abf1ff5225 100644 --- a/src/js/stendhal/util/WeatherRenderer.ts +++ b/src/js/stendhal/util/WeatherRenderer.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { singletons } from "../SingletonRepo"; import { Paths } from "../data/Paths"; import { TileStore } from "../data/TileStore"; @@ -110,7 +111,7 @@ export class WeatherRenderer { this.sprite = undefined; } else { const img = Paths.weather + "/" + weather + ".png"; - this.sprite = stendhal.data.sprites.get(img); + this.sprite = singletons.getSpriteStore().get(img); /* FIXME: * "TypeError: $stendhal$$.data.$tileset$.$weatherAnimationMap$ * is undefined". TileStore.weatherMap is not always loaded From 37d3e1c84dfc219fd151beb18cf09bdc454755f0 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 2 Jan 2026 04:11:11 +0100 Subject: [PATCH 042/162] fixed init order and wrong "this". --- src/js/stendhal/Client.ts | 21 +++++++++++---------- src/js/stendhal/main.ts | 22 ++++++++++++++++++---- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index f4ccdae9cd..a466f40428 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -19,6 +19,7 @@ import { Paths } from "./data/Paths"; import { Color } from "./data/color/Color"; +import { EntityRegistry } from "./entity/EntityRegistry"; import { Ground } from "./entity/Ground"; import { RPObject } from "./entity/RPObject"; @@ -95,10 +96,10 @@ export class Client { document.documentElement.setAttribute("data-build-version", stendhal.data.build.version); document.documentElement.setAttribute("data-build-build", stendhal.data.build.build); - stendhal.paths = singletons.getPaths(); stendhal.config = singletons.getConfigManager(); stendhal.session = singletons.getSessionManager(); stendhal.actions = singletons.getSlashActionRepo(); + new EntityRegistry().init(); this.initData(); this.initSound(); @@ -263,7 +264,7 @@ export class Client { if (!Client.instance.unloading) { Chat.logH("error", "Disconnected from server."); } - }; + }.bind(this); marauroa.clientFramework.onLoginRequired = function(config: Record) { if (config["client_login_url"]) { @@ -281,25 +282,25 @@ export class Client { "Login", new LoginDialog(), 100, 50).enableCloseButton(false); - }; + }.bind(this); marauroa.clientFramework.onCreateAccountAck = function(username: string) { // TODO: We should login automatically alert("Account succesfully created, please login."); window.location.reload(); - }; + }.bind(this); marauroa.clientFramework.onCreateCharacterAck = function(charname: string, _template: any) { // Client.get().chooseCharacter(charname); - }; + }.bind(this); marauroa.clientFramework.onLoginFailed = function(_reason: string, _text: string) { alert("Login failed. " + _text); // TODO: Server closes the connection, so we need to open a new one window.location.reload(); - }; + }.bind(this); - marauroa.clientFramework.onAvailableCharacterDetails = function(characters: {[key: string]: RPObject}) { + marauroa.clientFramework.onAvailableCharacterDetails = (characters: {[key: string]: RPObject}) => { SingletonFloatingWindow.closeAll(); if (!Object.keys(characters).length && this.username) { marauroa.clientFramework.createCharacter(this.username, {}); @@ -331,7 +332,7 @@ export class Client { } items[i]["ack"] = true; } - }; + }.bind(this); marauroa.clientFramework.onTransfer = function(items: any) { var data = {} as any; @@ -459,7 +460,7 @@ export class Client { document.addEventListener("click", Client.handleClickIndicator); document.addEventListener("touchend", Client.handleClickIndicator); }; - click_indicator.src = stendhal.paths.gui + "/click_indicator.png"; + click_indicator.src = Paths.gui + "/click_indicator.png"; } /** @@ -518,7 +519,7 @@ export class Client { */ onMouseEnter(e: MouseEvent) { // use Stendhal's built-in cursor for entire page - (e.target as HTMLElement).style.cursor = "url(" + stendhal.paths.sprites + "/cursor/normal.png) 1 3, auto"; + (e.target as HTMLElement).style.cursor = "url(" + Paths.sprites + "/cursor/normal.png) 1 3, auto"; } /** diff --git a/src/js/stendhal/main.ts b/src/js/stendhal/main.ts index ac2046f89e..27b51971ac 100644 --- a/src/js/stendhal/main.ts +++ b/src/js/stendhal/main.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2024 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -9,8 +9,22 @@ * * ***************************************************************************/ + import { Client } from "./Client"; +/* +declare var require: any; +require("marauroa/marauroa"); +require("marauroa/client-framework"); +require("marauroa/message-factory"); +require("marauroa/perception"); +require("marauroa/rpfactory"); +require("marauroa/inflate"); +require("marauroa/deserializer"); +require("marauroa/build"); // TODO +require("./data/sha3"); +*/ + declare var stendhal: any; @@ -30,6 +44,6 @@ function initGlobals() { stendhal.main.init(); - document.addEventListener('DOMContentLoaded', stendhal.main.startup); - window.addEventListener('error', stendhal.main.onerror); -})(); + document.addEventListener('DOMContentLoaded', () => stendhal.main.startup()); + window.addEventListener('error', (error: ErrorEvent) => stendhal.main.onError(error)); +})(); \ No newline at end of file From da4378d30c979d9d08d6aba183958f9ac47d6e5d Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 6 Jan 2026 21:43:35 +0100 Subject: [PATCH 043/162] updated marauroa --- libs/marauroa.jar | Bin 477179 -> 477245 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/marauroa.jar b/libs/marauroa.jar index 2ab331f0b554132f6b480961fdba94da58f8dc9e..85450462881a7bac13b753b0bcdf37eac5a9225f 100644 GIT binary patch delta 23443 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 InRd7T18Wi|A^-pY delta 23341 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∾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 From 819b80913f834c8c3055f15e56d39d69240fb317 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 6 Jan 2026 21:43:57 +0100 Subject: [PATCH 044/162] added esbuild as devDependencies --- package-lock.json | 485 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 3 +- 2 files changed, 486 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index bf69eee3f1..8a7c0b8380 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,454 @@ "version": "1.0.0", "license": "AGPL-3.0-or-later", "devDependencies": { + "esbuild": "0.27.2", "showdown": "^2.1.0", "typedoc": "^0.28.15", "typescript": "^5.9.3" } }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz", + "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz", + "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz", + "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz", + "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz", + "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz", + "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz", + "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz", + "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz", + "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz", + "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz", + "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz", + "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz", + "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz", + "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz", + "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz", + "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz", + "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz", + "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz", + "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz", + "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz", + "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz", + "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz", + "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz", + "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz", + "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz", + "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@gerrit0/mini-shiki": { "version": "3.20.0", "resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-3.20.0.tgz", @@ -135,6 +578,48 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/esbuild": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz", + "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.27.2", + "@esbuild/android-arm": "0.27.2", + "@esbuild/android-arm64": "0.27.2", + "@esbuild/android-x64": "0.27.2", + "@esbuild/darwin-arm64": "0.27.2", + "@esbuild/darwin-x64": "0.27.2", + "@esbuild/freebsd-arm64": "0.27.2", + "@esbuild/freebsd-x64": "0.27.2", + "@esbuild/linux-arm": "0.27.2", + "@esbuild/linux-arm64": "0.27.2", + "@esbuild/linux-ia32": "0.27.2", + "@esbuild/linux-loong64": "0.27.2", + "@esbuild/linux-mips64el": "0.27.2", + "@esbuild/linux-ppc64": "0.27.2", + "@esbuild/linux-riscv64": "0.27.2", + "@esbuild/linux-s390x": "0.27.2", + "@esbuild/linux-x64": "0.27.2", + "@esbuild/netbsd-arm64": "0.27.2", + "@esbuild/netbsd-x64": "0.27.2", + "@esbuild/openbsd-arm64": "0.27.2", + "@esbuild/openbsd-x64": "0.27.2", + "@esbuild/openharmony-arm64": "0.27.2", + "@esbuild/sunos-x64": "0.27.2", + "@esbuild/win32-arm64": "0.27.2", + "@esbuild/win32-ia32": "0.27.2", + "@esbuild/win32-x64": "0.27.2" + } + }, "node_modules/linkify-it": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", diff --git a/package.json b/package.json index 6585e78162..f24425a6d4 100644 --- a/package.json +++ b/package.json @@ -28,9 +28,8 @@ }, "homepage": "https://arianne-project.org", "private": true, - "dependencies": { - }, "devDependencies": { + "esbuild": "0.27.2", "showdown": "^2.1.0", "typedoc": "^0.28.15", "typescript": "^5.9.3" From 402bb84c4322e84a6f83ea8e350209448b85b359 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 6 Jan 2026 21:44:41 +0100 Subject: [PATCH 045/162] fixed this-reference and redirect to character selection on disconnect --- src/js/stendhal/Client.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index a466f40428..394df085a8 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright © 2023-2024 - Faiumoni e. V. * + * Copyright © 2023-2026 - Faiumoni e. V. * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -263,6 +263,9 @@ export class Client { marauroa.clientFramework.onDisconnect = function(_reason: string, _error: string) { if (!Client.instance.unloading) { Chat.logH("error", "Disconnected from server."); + if (window.location.hostname !== "localhost" && window.location.hostname !== "127.0.0.1" && window.location.hostname !== "::1") { + window.location.href = "/account/mycharacters.html"; + } } }.bind(this); @@ -334,7 +337,7 @@ export class Client { } }.bind(this); - marauroa.clientFramework.onTransfer = function(items: any) { + marauroa.clientFramework.onTransfer = (items: any) => { var data = {} as any; var zoneName = "" for (var i in items) { From d1fc6947b7a5c23f251442bfa87bf1ebeae3a6a0 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 6 Jan 2026 21:45:58 +0100 Subject: [PATCH 046/162] use esbuild --- buildtools/ant_modules/dist.xml | 87 ++++++++------------------------- src/js/stendhal/license.js | 2 +- src/js/stendhal/main.ts | 6 +-- 3 files changed, 24 insertions(+), 71 deletions(-) diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index ac9cfc3542..453695a1d2 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -665,17 +665,20 @@ - - + + + + - + + var stendhal = window.stendhal = window.stendhal || {}; stendhal.data = stendhal.data || {}; @@ -685,10 +688,15 @@ dist: "webclient" } + + + + + - + @@ -713,72 +721,19 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -//# sourceMappingURL=stendhal-compiled.js.map - + + + + + + + + diff --git a/src/js/stendhal/license.js b/src/js/stendhal/license.js index 998fb61401..86e2af4ccb 100644 --- a/src/js/stendhal/license.js +++ b/src/js/stendhal/license.js @@ -1,7 +1,7 @@ /** * @license *************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/js/stendhal/main.ts b/src/js/stendhal/main.ts index 27b51971ac..af2208441e 100644 --- a/src/js/stendhal/main.ts +++ b/src/js/stendhal/main.ts @@ -12,18 +12,16 @@ import { Client } from "./Client"; -/* declare var require: any; +(window as any)["Zlib"] = require("marauroa/inflate").Zlib; require("marauroa/marauroa"); require("marauroa/client-framework"); require("marauroa/message-factory"); require("marauroa/perception"); require("marauroa/rpfactory"); -require("marauroa/inflate"); require("marauroa/deserializer"); -require("marauroa/build"); // TODO +require("marauroa/build"); require("./data/sha3"); -*/ declare var stendhal: any; From 8cb1a7b050e2ae92e6627f3acca24b5c86e20ed4 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 9 Jan 2026 00:06:37 +0100 Subject: [PATCH 047/162] converted stendhal object into a static class --- buildtools/ant_modules/dist.xml | 24 ++++++++++--------- src/js/stendhal/Client.ts | 10 ++++---- src/js/stendhal/EventRegistry.ts | 2 +- src/js/stendhal/PerceptionListener.ts | 2 +- src/js/stendhal/SlashActionRepo.ts | 2 +- src/js/stendhal/action/AboutAction.ts | 2 +- src/js/stendhal/action/DebugAction.ts | 2 +- src/js/stendhal/action/ScreenCaptureAction.ts | 3 +-- src/js/stendhal/action/SettingsAction.ts | 2 +- src/js/stendhal/data/CStatus.ts | 2 +- src/js/stendhal/data/CacheManager.ts | 2 +- src/js/stendhal/data/EntityOverlayRegistry.ts | 2 +- src/js/stendhal/data/GroupManager.ts | 2 +- src/js/stendhal/data/ImagePreloader.ts | 2 +- src/js/stendhal/data/Outfit.ts | 2 +- src/js/stendhal/data/SpriteStore.ts | 2 +- src/js/stendhal/data/TileMap.ts | 2 +- .../data/sound/LoopedSoundSourceManager.ts | 2 +- src/js/stendhal/data/sound/SoundManager.ts | 2 +- src/js/stendhal/entity/ActiveEntity.ts | 2 +- src/js/stendhal/entity/Blood.ts | 2 +- src/js/stendhal/entity/Chest.ts | 2 +- src/js/stendhal/entity/Corpse.ts | 2 +- src/js/stendhal/entity/Creature.ts | 2 +- src/js/stendhal/entity/Entity.ts | 2 +- src/js/stendhal/entity/GameBoard.ts | 2 +- src/js/stendhal/entity/Ground.ts | 2 +- src/js/stendhal/entity/InvisibleEntity.ts | 2 +- src/js/stendhal/entity/NPC.ts | 2 +- src/js/stendhal/entity/Player.ts | 2 +- src/js/stendhal/entity/Portal.ts | 2 +- src/js/stendhal/entity/RPEntity.ts | 2 +- src/js/stendhal/entity/Sign.ts | 2 +- src/js/stendhal/entity/TrainingDummy.ts | 2 +- src/js/stendhal/entity/UseableEntity.ts | 2 +- src/js/stendhal/entity/User.ts | 2 +- src/js/stendhal/entity/VisibleEntity.ts | 2 +- src/js/stendhal/entity/WalkBlocker.ts | 2 +- src/js/stendhal/entity/Zone.ts | 2 +- src/js/stendhal/event/BestiaryEvent.ts | 2 +- src/js/stendhal/event/GroupChangeEvent.ts | 2 +- src/js/stendhal/event/PlayerLoggedOnEvent.ts | 2 +- src/js/stendhal/event/PlayerLoggedOutEvent.ts | 2 +- src/js/stendhal/event/ProgressStatusEvent.ts | 3 +-- src/js/stendhal/event/ShowItemListEvent.ts | 2 +- src/js/stendhal/event/ShowOutfitListEvent.ts | 2 +- src/js/stendhal/event/SoundEvent.ts | 2 +- src/js/stendhal/event/TradeEvent.ts | 2 +- src/js/stendhal/event/ViewChangeEvent.ts | 2 +- src/js/stendhal/landscape/CombinedTileset.ts | 2 +- .../landscape/CombinedTilesetImageLoader.ts | 2 +- .../IndividualTilesetRenderingStrategy.ts | 2 +- .../stendhal/landscape/LandscapeRenderer.ts | 2 +- .../landscape/LandscapeRenderingStrategy.ts | 2 +- .../sprite/ActivityIndicatorSprite.ts | 2 +- src/js/stendhal/sprite/NotificationBubble.ts | 2 +- src/js/stendhal/sprite/SpeechBubble.ts | 2 +- src/js/stendhal/sprite/TextBubble.ts | 2 +- .../sprite/action/BarehandAttackSprite.ts | 2 +- .../sprite/action/RangedAttackSprite.ts | 2 +- src/js/stendhal/stendhal.ts | 14 +++++++++++ src/js/stendhal/ui/HeldObject.ts | 2 +- src/js/stendhal/ui/Inventory.ts | 2 +- src/js/stendhal/ui/TouchHandler.ts | 2 +- src/js/stendhal/ui/UI.ts | 2 +- src/js/stendhal/ui/ViewPort.ts | 2 +- .../ui/component/BuddyListComponent.ts | 2 +- .../ui/component/ChatInputComponent.ts | 2 +- .../stendhal/ui/component/ChatLogComponent.ts | 2 +- .../ui/component/GroupMemberComponent.ts | 2 +- .../ui/component/GroupPanelComponent.ts | 2 +- .../component/ItemContainerImplementation.ts | 2 +- .../ui/component/ItemInventoryComponent.ts | 2 +- .../stendhal/ui/component/MiniMapComponent.ts | 2 +- .../ui/component/PlayerStatsComponent.ts | 2 +- .../stendhal/ui/dialog/ActionContextMenu.ts | 2 +- .../ui/dialog/ApplicationMenuDialog.ts | 2 +- .../stendhal/ui/dialog/ChatOptionsDialog.ts | 2 +- src/js/stendhal/ui/dialog/EmojiMapDialog.ts | 2 +- .../stendhal/ui/dialog/ImageViewerDialog.ts | 2 +- src/js/stendhal/ui/dialog/SettingsDialog.ts | 2 +- src/js/stendhal/ui/dialog/TravelLogDialog.ts | 2 +- .../stendhal/ui/dialog/outfit/OutfitDialog.ts | 2 +- .../ui/dialog/outfit/OutfitPartSelector.ts | 2 +- .../ui/factory/DesktopUserInterfaceFactory.ts | 2 +- src/js/stendhal/ui/joystick/Joystick.ts | 2 +- src/js/stendhal/ui/joystick/JoystickImpl.ts | 2 +- .../stendhal/ui/quickmenu/JoystickButton.ts | 2 +- src/js/stendhal/ui/quickmenu/MenuButton.ts | 2 +- .../ui/quickmenu/PathFindingButton.ts | 2 +- .../stendhal/ui/quickmenu/QuickMenuButton.ts | 2 +- src/js/stendhal/ui/quickmenu/SoundButton.ts | 2 +- .../ui/toolkit/DialogContentComponent.ts | 3 --- src/js/stendhal/ui/toolkit/FloatingWindow.ts | 3 +-- src/js/stendhal/util/Chat.ts | 2 +- src/js/stendhal/util/ChatCompletionHelper.ts | 2 +- src/js/stendhal/util/ConfigManager.ts | 2 +- src/js/stendhal/util/ElementClickListener.ts | 2 +- src/js/stendhal/util/JSONLoader.ts | 2 +- src/js/stendhal/util/SessionManager.ts | 2 +- src/js/stendhal/util/WeatherRenderer.ts | 2 +- 101 files changed, 129 insertions(+), 119 deletions(-) create mode 100644 src/js/stendhal/stendhal.ts diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index 453695a1d2..b2e16cea56 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -679,20 +679,22 @@ - var stendhal = window.stendhal = window.stendhal || {}; - stendhal.data = stendhal.data || {}; +export function version(stendhal) { + stendhal.data = stendhal.data || {}; - stendhal.data.build = { - version: "${version}", - build: "${datetime}", - dist: "webclient" - } + stendhal.data.build = { + version: "${version}", + build: "${datetime}", + dist: "webclient" + } + + //CI +} + - - - - + + diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index 394df085a8..af04fa68f3 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "./stendhal"; import { PerceptionListener } from "./PerceptionListener"; import { singletons } from "./SingletonRepo"; @@ -92,10 +92,6 @@ export class Client { } this.initialized = true; - // add version & build info to DOM for retrieval by browser - document.documentElement.setAttribute("data-build-version", stendhal.data.build.version); - document.documentElement.setAttribute("data-build-build", stendhal.data.build.build); - stendhal.config = singletons.getConfigManager(); stendhal.session = singletons.getSessionManager(); stendhal.actions = singletons.getSlashActionRepo(); @@ -105,6 +101,10 @@ export class Client { this.initSound(); this.initUI(); this.initZone(); + + // add version & build info to DOM for retrieval by browser + document.documentElement.setAttribute("data-build-version", stendhal.data.build?.version); + document.documentElement.setAttribute("data-build-build", stendhal.data.build?.build); } /** diff --git a/src/js/stendhal/EventRegistry.ts b/src/js/stendhal/EventRegistry.ts index 6a92619cc1..192fda76f6 100644 --- a/src/js/stendhal/EventRegistry.ts +++ b/src/js/stendhal/EventRegistry.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "./stendhal"; import { RPEntity } from "./entity/RPEntity"; import { RPObject } from "./entity/RPObject"; diff --git a/src/js/stendhal/PerceptionListener.ts b/src/js/stendhal/PerceptionListener.ts index f2bccf6fdf..7eab288921 100644 --- a/src/js/stendhal/PerceptionListener.ts +++ b/src/js/stendhal/PerceptionListener.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "./stendhal"; import { RPObject } from "./entity/RPObject"; diff --git a/src/js/stendhal/SlashActionRepo.ts b/src/js/stendhal/SlashActionRepo.ts index 97b9ffd77b..99570e7645 100644 --- a/src/js/stendhal/SlashActionRepo.ts +++ b/src/js/stendhal/SlashActionRepo.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "./stendhal"; import { singletons } from "./SingletonRepo"; diff --git a/src/js/stendhal/action/AboutAction.ts b/src/js/stendhal/action/AboutAction.ts index bce90a0ea3..5ab56f90f0 100644 --- a/src/js/stendhal/action/AboutAction.ts +++ b/src/js/stendhal/action/AboutAction.ts @@ -10,7 +10,6 @@ * * ***************************************************************************/ -declare var stendhal: any; import { ParamList } from "./ParamList"; import { SlashAction } from "./SlashAction"; @@ -20,6 +19,7 @@ import { ui } from "../ui/UI"; import { AboutDialog } from "../ui/dialog/AboutDialog"; import { Pair } from "../util/Pair"; +import { stendhal } from "../stendhal"; export class AboutAction extends SlashAction { diff --git a/src/js/stendhal/action/DebugAction.ts b/src/js/stendhal/action/DebugAction.ts index 81cfcda0a7..7df16e5117 100644 --- a/src/js/stendhal/action/DebugAction.ts +++ b/src/js/stendhal/action/DebugAction.ts @@ -24,7 +24,7 @@ import { Debug } from "../util/Debug"; import { Paths } from "../data/Paths"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; /** * performances debugging actions diff --git a/src/js/stendhal/action/ScreenCaptureAction.ts b/src/js/stendhal/action/ScreenCaptureAction.ts index 539e89a486..2dc01892f7 100644 --- a/src/js/stendhal/action/ScreenCaptureAction.ts +++ b/src/js/stendhal/action/ScreenCaptureAction.ts @@ -13,9 +13,8 @@ import { SlashAction } from "./SlashAction"; import { ScreenCapture } from "../util/ScreenCapture"; -import { Canvas } from "util/Types"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class ScreenCaptureAction extends SlashAction { diff --git a/src/js/stendhal/action/SettingsAction.ts b/src/js/stendhal/action/SettingsAction.ts index 13dc33f351..9396e8e7d3 100644 --- a/src/js/stendhal/action/SettingsAction.ts +++ b/src/js/stendhal/action/SettingsAction.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { SlashAction } from "./SlashAction"; diff --git a/src/js/stendhal/data/CStatus.ts b/src/js/stendhal/data/CStatus.ts index feb9b2497b..df4ec65dc4 100644 --- a/src/js/stendhal/data/CStatus.ts +++ b/src/js/stendhal/data/CStatus.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class CStatus { diff --git a/src/js/stendhal/data/CacheManager.ts b/src/js/stendhal/data/CacheManager.ts index a65ff5c1c5..e3b66bb1bb 100644 --- a/src/js/stendhal/data/CacheManager.ts +++ b/src/js/stendhal/data/CacheManager.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; /** diff --git a/src/js/stendhal/data/EntityOverlayRegistry.ts b/src/js/stendhal/data/EntityOverlayRegistry.ts index c651e405cd..3be6716b9b 100644 --- a/src/js/stendhal/data/EntityOverlayRegistry.ts +++ b/src/js/stendhal/data/EntityOverlayRegistry.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { Entity } from "../entity/Entity"; diff --git a/src/js/stendhal/data/GroupManager.ts b/src/js/stendhal/data/GroupManager.ts index 9423ba2f6a..3c2b6f9b49 100644 --- a/src/js/stendhal/data/GroupManager.ts +++ b/src/js/stendhal/data/GroupManager.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { SlashActionRepo } from "../SlashActionRepo"; diff --git a/src/js/stendhal/data/ImagePreloader.ts b/src/js/stendhal/data/ImagePreloader.ts index cb83480709..87ff9a2852 100644 --- a/src/js/stendhal/data/ImagePreloader.ts +++ b/src/js/stendhal/data/ImagePreloader.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; /* diff --git a/src/js/stendhal/data/Outfit.ts b/src/js/stendhal/data/Outfit.ts index 680f6dbc11..baf132784a 100644 --- a/src/js/stendhal/data/Outfit.ts +++ b/src/js/stendhal/data/Outfit.ts @@ -17,7 +17,7 @@ import { StringUtil } from "../util/StringUtil"; import { Paths } from "./Paths"; import { SpriteImage } from "../data/SpriteStore"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; /** diff --git a/src/js/stendhal/data/SpriteStore.ts b/src/js/stendhal/data/SpriteStore.ts index 8260e44f0a..e67982a079 100644 --- a/src/js/stendhal/data/SpriteStore.ts +++ b/src/js/stendhal/data/SpriteStore.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { Paths } from "./Paths"; diff --git a/src/js/stendhal/data/TileMap.ts b/src/js/stendhal/data/TileMap.ts index 6c5fd81167..66c2f5c2e8 100644 --- a/src/js/stendhal/data/TileMap.ts +++ b/src/js/stendhal/data/TileMap.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { Paths } from "./Paths"; diff --git a/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts b/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts index bce6834e88..5580e293aa 100644 --- a/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts +++ b/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { LoopedSoundSource } from "../../entity/LoopedSoundSource"; diff --git a/src/js/stendhal/data/sound/SoundManager.ts b/src/js/stendhal/data/sound/SoundManager.ts index 743948db63..eabadae50b 100644 --- a/src/js/stendhal/data/sound/SoundManager.ts +++ b/src/js/stendhal/data/sound/SoundManager.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { SoundFactory } from "./SoundFactory"; import { SoundObject } from "./SoundFactory"; diff --git a/src/js/stendhal/entity/ActiveEntity.ts b/src/js/stendhal/entity/ActiveEntity.ts index 0807fb1808..e82ac36026 100644 --- a/src/js/stendhal/entity/ActiveEntity.ts +++ b/src/js/stendhal/entity/ActiveEntity.ts @@ -13,7 +13,7 @@ import { Entity } from "./Entity"; import { Direction } from "../util/Direction"; import { MathUtil } from "../util/MathUtil"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class ActiveEntity extends Entity { diff --git a/src/js/stendhal/entity/Blood.ts b/src/js/stendhal/entity/Blood.ts index ea30c4df77..2048e345d3 100644 --- a/src/js/stendhal/entity/Blood.ts +++ b/src/js/stendhal/entity/Blood.ts @@ -13,7 +13,7 @@ import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class Blood extends Entity { diff --git a/src/js/stendhal/entity/Chest.ts b/src/js/stendhal/entity/Chest.ts index 9a38e51d4e..6abcff9e17 100644 --- a/src/js/stendhal/entity/Chest.ts +++ b/src/js/stendhal/entity/Chest.ts @@ -22,7 +22,7 @@ import { Chat } from "../util/Chat"; import { Paths } from "../data/Paths"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; let OPEN_SPRITE = { diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index 3c20855e20..e8c1e9b470 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -22,7 +22,7 @@ import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class Corpse extends PopupInventory { diff --git a/src/js/stendhal/entity/Creature.ts b/src/js/stendhal/entity/Creature.ts index 97523a4d46..9fd20fe16d 100644 --- a/src/js/stendhal/entity/Creature.ts +++ b/src/js/stendhal/entity/Creature.ts @@ -19,7 +19,7 @@ import { SkillEffect } from "../sprite/action/SkillEffect"; import { Paths } from "../data/Paths"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class Creature extends RPEntity { diff --git a/src/js/stendhal/entity/Entity.ts b/src/js/stendhal/entity/Entity.ts index c61ffc3703..4a7b24851e 100644 --- a/src/js/stendhal/entity/Entity.ts +++ b/src/js/stendhal/entity/Entity.ts @@ -17,7 +17,7 @@ import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; /** * General entity diff --git a/src/js/stendhal/entity/GameBoard.ts b/src/js/stendhal/entity/GameBoard.ts index 915cad8eac..1e87563520 100644 --- a/src/js/stendhal/entity/GameBoard.ts +++ b/src/js/stendhal/entity/GameBoard.ts @@ -12,7 +12,7 @@ import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class GameBoard extends Entity { diff --git a/src/js/stendhal/entity/Ground.ts b/src/js/stendhal/entity/Ground.ts index a8d9adc7cf..bb417af624 100644 --- a/src/js/stendhal/entity/Ground.ts +++ b/src/js/stendhal/entity/Ground.ts @@ -12,7 +12,7 @@ import { Paths } from "../data/Paths"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; /** diff --git a/src/js/stendhal/entity/InvisibleEntity.ts b/src/js/stendhal/entity/InvisibleEntity.ts index 2d862a24b7..1d0d29b63a 100644 --- a/src/js/stendhal/entity/InvisibleEntity.ts +++ b/src/js/stendhal/entity/InvisibleEntity.ts @@ -12,7 +12,7 @@ import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class InvisibleEntity extends Entity { diff --git a/src/js/stendhal/entity/NPC.ts b/src/js/stendhal/entity/NPC.ts index 0acb1a1223..f9e079977a 100644 --- a/src/js/stendhal/entity/NPC.ts +++ b/src/js/stendhal/entity/NPC.ts @@ -17,7 +17,7 @@ import { Color } from "../data/color/Color"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class NPC extends RPEntity { override minimapStyle = Color.NPC; diff --git a/src/js/stendhal/entity/Player.ts b/src/js/stendhal/entity/Player.ts index 98e71bac07..4f29d21c28 100644 --- a/src/js/stendhal/entity/Player.ts +++ b/src/js/stendhal/entity/Player.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { RPEntity } from "./RPEntity"; diff --git a/src/js/stendhal/entity/Portal.ts b/src/js/stendhal/entity/Portal.ts index 2410693c7f..5142b226bb 100644 --- a/src/js/stendhal/entity/Portal.ts +++ b/src/js/stendhal/entity/Portal.ts @@ -16,7 +16,7 @@ import { Color } from "../data/color/Color"; import { Paths } from "../data/Paths"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class Portal extends Entity { diff --git a/src/js/stendhal/entity/RPEntity.ts b/src/js/stendhal/entity/RPEntity.ts index a75cc876f0..cbc373392f 100644 --- a/src/js/stendhal/entity/RPEntity.ts +++ b/src/js/stendhal/entity/RPEntity.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { ActiveEntity } from "./ActiveEntity"; import { Entity } from "./Entity"; diff --git a/src/js/stendhal/entity/Sign.ts b/src/js/stendhal/entity/Sign.ts index a7640cb340..2a477bd2a6 100644 --- a/src/js/stendhal/entity/Sign.ts +++ b/src/js/stendhal/entity/Sign.ts @@ -15,7 +15,7 @@ import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class Sign extends Entity { override zIndex = 5000; diff --git a/src/js/stendhal/entity/TrainingDummy.ts b/src/js/stendhal/entity/TrainingDummy.ts index 9f4460fc21..621e8abadf 100644 --- a/src/js/stendhal/entity/TrainingDummy.ts +++ b/src/js/stendhal/entity/TrainingDummy.ts @@ -13,7 +13,7 @@ import { Paths } from "../data/Paths"; import { NPC } from "./NPC"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class TrainingDummy extends NPC { diff --git a/src/js/stendhal/entity/UseableEntity.ts b/src/js/stendhal/entity/UseableEntity.ts index d9bdf003c4..edfb2b11e9 100644 --- a/src/js/stendhal/entity/UseableEntity.ts +++ b/src/js/stendhal/entity/UseableEntity.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { Entity } from "./Entity"; import { MenuItem } from "../action/MenuItem"; diff --git a/src/js/stendhal/entity/User.ts b/src/js/stendhal/entity/User.ts index 353ee34152..f121f8dc4f 100644 --- a/src/js/stendhal/entity/User.ts +++ b/src/js/stendhal/entity/User.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { Entity } from "./Entity"; import { Player } from "./Player"; diff --git a/src/js/stendhal/entity/VisibleEntity.ts b/src/js/stendhal/entity/VisibleEntity.ts index 854a29fc22..eca1fa2a04 100644 --- a/src/js/stendhal/entity/VisibleEntity.ts +++ b/src/js/stendhal/entity/VisibleEntity.ts @@ -12,7 +12,7 @@ import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class VisibleEntity extends Entity { diff --git a/src/js/stendhal/entity/WalkBlocker.ts b/src/js/stendhal/entity/WalkBlocker.ts index ddaed24826..d92d2fb107 100644 --- a/src/js/stendhal/entity/WalkBlocker.ts +++ b/src/js/stendhal/entity/WalkBlocker.ts @@ -12,7 +12,7 @@ import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class WalkBlocker extends Entity { diff --git a/src/js/stendhal/entity/Zone.ts b/src/js/stendhal/entity/Zone.ts index 6afb996d9b..470acaf4f7 100644 --- a/src/js/stendhal/entity/Zone.ts +++ b/src/js/stendhal/entity/Zone.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { Entity } from "./Entity"; import { Player } from "./Player"; diff --git a/src/js/stendhal/event/BestiaryEvent.ts b/src/js/stendhal/event/BestiaryEvent.ts index b6c3d1d47c..0432cff13f 100644 --- a/src/js/stendhal/event/BestiaryEvent.ts +++ b/src/js/stendhal/event/BestiaryEvent.ts @@ -16,7 +16,7 @@ import { ui } from "../ui/UI"; import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class BestiaryEvent extends RPEvent { diff --git a/src/js/stendhal/event/GroupChangeEvent.ts b/src/js/stendhal/event/GroupChangeEvent.ts index 713a26f7b8..4f6836232a 100644 --- a/src/js/stendhal/event/GroupChangeEvent.ts +++ b/src/js/stendhal/event/GroupChangeEvent.ts @@ -14,7 +14,7 @@ import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { GroupPanelComponent } from "../ui/component/GroupPanelComponent"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; declare var marauroa: any; /** diff --git a/src/js/stendhal/event/PlayerLoggedOnEvent.ts b/src/js/stendhal/event/PlayerLoggedOnEvent.ts index d24042385d..be4429a1cf 100644 --- a/src/js/stendhal/event/PlayerLoggedOnEvent.ts +++ b/src/js/stendhal/event/PlayerLoggedOnEvent.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { RPEvent } from "./RPEvent"; diff --git a/src/js/stendhal/event/PlayerLoggedOutEvent.ts b/src/js/stendhal/event/PlayerLoggedOutEvent.ts index f976a8cd64..a47ff73702 100644 --- a/src/js/stendhal/event/PlayerLoggedOutEvent.ts +++ b/src/js/stendhal/event/PlayerLoggedOutEvent.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { RPEvent } from "./RPEvent"; diff --git a/src/js/stendhal/event/ProgressStatusEvent.ts b/src/js/stendhal/event/ProgressStatusEvent.ts index 16b36e78f8..1eb9c50a73 100644 --- a/src/js/stendhal/event/ProgressStatusEvent.ts +++ b/src/js/stendhal/event/ProgressStatusEvent.ts @@ -14,8 +14,7 @@ import { TravelLogDialog } from "../ui/dialog/TravelLogDialog"; import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { RPEvent } from "./RPEvent"; - -declare let stendhal: any; +import { stendhal } from "stendhal"; /** diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts index 9744738e6d..8edfde1174 100644 --- a/src/js/stendhal/event/ShowItemListEvent.ts +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -18,7 +18,7 @@ import { Chat } from "../util/Chat"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class ShowItemListEvent extends RPEvent { diff --git a/src/js/stendhal/event/ShowOutfitListEvent.ts b/src/js/stendhal/event/ShowOutfitListEvent.ts index dbaf651b4f..9995fdd7af 100644 --- a/src/js/stendhal/event/ShowOutfitListEvent.ts +++ b/src/js/stendhal/event/ShowOutfitListEvent.ts @@ -15,7 +15,7 @@ import { RPEvent } from "./RPEvent"; import { ui } from "../ui/UI"; import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class ShowOutfitListEvent extends RPEvent { diff --git a/src/js/stendhal/event/SoundEvent.ts b/src/js/stendhal/event/SoundEvent.ts index 7a0654847b..3a85e9d6bb 100644 --- a/src/js/stendhal/event/SoundEvent.ts +++ b/src/js/stendhal/event/SoundEvent.ts @@ -16,7 +16,7 @@ import { SoundID } from "../data/sound/SoundID"; import { SoundManager } from "../data/sound/SoundManager"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class SoundEvent extends RPEvent { diff --git a/src/js/stendhal/event/TradeEvent.ts b/src/js/stendhal/event/TradeEvent.ts index 76eac52690..7216a57733 100644 --- a/src/js/stendhal/event/TradeEvent.ts +++ b/src/js/stendhal/event/TradeEvent.ts @@ -17,7 +17,7 @@ import { ui } from "../ui/UI"; import { RPEvent } from "./RPEvent"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; declare var marauroa: any; /** diff --git a/src/js/stendhal/event/ViewChangeEvent.ts b/src/js/stendhal/event/ViewChangeEvent.ts index 022111416e..7067e6cbf7 100644 --- a/src/js/stendhal/event/ViewChangeEvent.ts +++ b/src/js/stendhal/event/ViewChangeEvent.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { Canvas } from "util/Types"; import { RPEvent } from "./RPEvent"; diff --git a/src/js/stendhal/landscape/CombinedTileset.ts b/src/js/stendhal/landscape/CombinedTileset.ts index 43a4b24e9b..fce0f42de1 100644 --- a/src/js/stendhal/landscape/CombinedTileset.ts +++ b/src/js/stendhal/landscape/CombinedTileset.ts @@ -11,7 +11,7 @@ import { Canvas, RenderingContext2D } from "util/Types"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; /** * a combined tileset with group layers using one single tileset image. diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index dc0f024bd4..1a69360d7d 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -15,7 +15,7 @@ import { MapOfSets } from "../util/MapOfSets"; import { CombinedTileset } from "./CombinedTileset"; import { Debug } from "../util/Debug"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class CombinedTilesetImageLoader { diff --git a/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts b/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts index 0920d981d1..3868b5d073 100644 --- a/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts +++ b/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { LandscapeRenderingStrategy } from "./LandscapeRenderingStrategy"; import { ImagePreloader } from "../data/ImagePreloader"; diff --git a/src/js/stendhal/landscape/LandscapeRenderer.ts b/src/js/stendhal/landscape/LandscapeRenderer.ts index 135b2bb6f5..cbdcff9ff9 100644 --- a/src/js/stendhal/landscape/LandscapeRenderer.ts +++ b/src/js/stendhal/landscape/LandscapeRenderer.ts @@ -12,7 +12,7 @@ import { Canvas, RenderingContext2D } from "util/Types"; import { CombinedTileset } from "./CombinedTileset"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class LandscapeRenderer { diff --git a/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts b/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts index 7ca2156637..297a93ed2a 100644 --- a/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts +++ b/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts @@ -15,7 +15,7 @@ import { CombinedTilesetFactory } from "./CombinedTilesetFactory"; import { LandscapeRenderer } from "./LandscapeRenderer"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export abstract class LandscapeRenderingStrategy { diff --git a/src/js/stendhal/sprite/ActivityIndicatorSprite.ts b/src/js/stendhal/sprite/ActivityIndicatorSprite.ts index a81a3358bb..0ab17759ed 100644 --- a/src/js/stendhal/sprite/ActivityIndicatorSprite.ts +++ b/src/js/stendhal/sprite/ActivityIndicatorSprite.ts @@ -13,7 +13,7 @@ import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; /** diff --git a/src/js/stendhal/sprite/NotificationBubble.ts b/src/js/stendhal/sprite/NotificationBubble.ts index aa81d4b9d7..6232b3f492 100644 --- a/src/js/stendhal/sprite/NotificationBubble.ts +++ b/src/js/stendhal/sprite/NotificationBubble.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { TextBubble } from "./TextBubble"; diff --git a/src/js/stendhal/sprite/SpeechBubble.ts b/src/js/stendhal/sprite/SpeechBubble.ts index 623e9b06cf..fd81825daf 100644 --- a/src/js/stendhal/sprite/SpeechBubble.ts +++ b/src/js/stendhal/sprite/SpeechBubble.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { TextBubble } from "./TextBubble"; diff --git a/src/js/stendhal/sprite/TextBubble.ts b/src/js/stendhal/sprite/TextBubble.ts index fe522658b1..4c76fa15a0 100644 --- a/src/js/stendhal/sprite/TextBubble.ts +++ b/src/js/stendhal/sprite/TextBubble.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { RenderingContext2D } from "util/Types"; import { Color } from "../data/color/Color"; diff --git a/src/js/stendhal/sprite/action/BarehandAttackSprite.ts b/src/js/stendhal/sprite/action/BarehandAttackSprite.ts index a7e41a5b83..c05ab26542 100644 --- a/src/js/stendhal/sprite/action/BarehandAttackSprite.ts +++ b/src/js/stendhal/sprite/action/BarehandAttackSprite.ts @@ -14,7 +14,7 @@ import { AttackSprite } from "./AttackSprite"; import { RPEntity } from "../../entity/RPEntity"; import { RenderingContext2D } from "util/Types"; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; export class BarehandAttackSprite extends AttackSprite { diff --git a/src/js/stendhal/sprite/action/RangedAttackSprite.ts b/src/js/stendhal/sprite/action/RangedAttackSprite.ts index 119dd59cf6..d098efdc68 100644 --- a/src/js/stendhal/sprite/action/RangedAttackSprite.ts +++ b/src/js/stendhal/sprite/action/RangedAttackSprite.ts @@ -16,7 +16,7 @@ import { RenderingContext2D } from "util/Types"; import { Paths } from "../../data/Paths"; import { singletons } from "../../SingletonRepo"; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; export class RangedAttackSprite extends AttackSprite { diff --git a/src/js/stendhal/stendhal.ts b/src/js/stendhal/stendhal.ts new file mode 100644 index 0000000000..7c9adb59b1 --- /dev/null +++ b/src/js/stendhal/stendhal.ts @@ -0,0 +1,14 @@ +/** + * this class helps with refactoring from JavaScript to TypeScript. + */ +export class stendhal { + static config: any; + static ui: any; + static sound: any; + static zone: any; + static data: any; + static session: any; + static main: any; + static actions: any; + static players: any +} \ No newline at end of file diff --git a/src/js/stendhal/ui/HeldObject.ts b/src/js/stendhal/ui/HeldObject.ts index f2d521946d..b9dfef374e 100644 --- a/src/js/stendhal/ui/HeldObject.ts +++ b/src/js/stendhal/ui/HeldObject.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { Point } from "../util/Point"; diff --git a/src/js/stendhal/ui/Inventory.ts b/src/js/stendhal/ui/Inventory.ts index 90163cf7e0..4ea876aadd 100644 --- a/src/js/stendhal/ui/Inventory.ts +++ b/src/js/stendhal/ui/Inventory.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { ItemContainerImplementation } from "./component/ItemContainerImplementation"; diff --git a/src/js/stendhal/ui/TouchHandler.ts b/src/js/stendhal/ui/TouchHandler.ts index 6bc38bc897..a50f54ce7b 100644 --- a/src/js/stendhal/ui/TouchHandler.ts +++ b/src/js/stendhal/ui/TouchHandler.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { Point } from "../util/Point"; diff --git a/src/js/stendhal/ui/UI.ts b/src/js/stendhal/ui/UI.ts index b718905db4..816102cbd0 100644 --- a/src/js/stendhal/ui/UI.ts +++ b/src/js/stendhal/ui/UI.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { UIComponentEnum } from "./UIComponentEnum"; import { SoftwareJoystickController } from "./SoftwareJoystickController"; diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index 758db5ddf5..74ec698bfe 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { HeldObject } from "./HeldObject"; import { ui } from "./UI"; diff --git a/src/js/stendhal/ui/component/BuddyListComponent.ts b/src/js/stendhal/ui/component/BuddyListComponent.ts index 9c2d0c7254..273feacfaa 100644 --- a/src/js/stendhal/ui/component/BuddyListComponent.ts +++ b/src/js/stendhal/ui/component/BuddyListComponent.ts @@ -17,10 +17,10 @@ import { Component } from "../toolkit/Component"; import { ActionContextMenu } from "../dialog/ActionContextMenu"; import { ChatInputComponent } from "./ChatInputComponent"; import { Paths } from "../../data/Paths"; +import { stendhal } from "stendhal"; declare let marauroa: any; -declare let stendhal: any; /** * displays the player stats diff --git a/src/js/stendhal/ui/component/ChatInputComponent.ts b/src/js/stendhal/ui/component/ChatInputComponent.ts index 8229ca0720..197d08e697 100644 --- a/src/js/stendhal/ui/component/ChatInputComponent.ts +++ b/src/js/stendhal/ui/component/ChatInputComponent.ts @@ -10,7 +10,6 @@ ***************************************************************************/ declare let marauroa: any; -declare let stendhal: any; import { ChatPanel } from "../ChatPanel"; import { ui } from "../UI"; @@ -22,6 +21,7 @@ import { singletons } from "../../SingletonRepo"; import { ChatCompletionHelper } from "../../util/ChatCompletionHelper"; import { KeyCode } from "../../util/KeyCode"; import { Paths } from "../../data/Paths"; +import { stendhal } from "stendhal"; /** diff --git a/src/js/stendhal/ui/component/ChatLogComponent.ts b/src/js/stendhal/ui/component/ChatLogComponent.ts index fbdf9e0735..45dbdba79b 100644 --- a/src/js/stendhal/ui/component/ChatLogComponent.ts +++ b/src/js/stendhal/ui/component/ChatLogComponent.ts @@ -16,7 +16,7 @@ import { UIComponentEnum } from "../UIComponentEnum"; import { singletons } from "../../SingletonRepo"; import { Chat } from "../../util/Chat"; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; /** diff --git a/src/js/stendhal/ui/component/GroupMemberComponent.ts b/src/js/stendhal/ui/component/GroupMemberComponent.ts index 6981457a2f..b2942f29b4 100644 --- a/src/js/stendhal/ui/component/GroupMemberComponent.ts +++ b/src/js/stendhal/ui/component/GroupMemberComponent.ts @@ -10,7 +10,6 @@ ***************************************************************************/ declare let marauroa: any; -declare let stendhal: any; import { ChatInputComponent } from "./ChatInputComponent"; @@ -24,6 +23,7 @@ import { StatBarComponent } from "../component/StatBarComponent"; import { ActionContextMenu } from "../dialog/ActionContextMenu"; import { singletons } from "../../SingletonRepo"; +import { stendhal } from "stendhal"; /** diff --git a/src/js/stendhal/ui/component/GroupPanelComponent.ts b/src/js/stendhal/ui/component/GroupPanelComponent.ts index 64cb587ff8..a277f94395 100644 --- a/src/js/stendhal/ui/component/GroupPanelComponent.ts +++ b/src/js/stendhal/ui/component/GroupPanelComponent.ts @@ -10,7 +10,6 @@ ***************************************************************************/ declare let marauroa: any; -declare let stendhal: any; import { ChatInputComponent } from "./ChatInputComponent"; import { GroupMemberComponent } from "./GroupMemberComponent"; @@ -23,6 +22,7 @@ import { Panel } from "../toolkit/Panel"; import { TabPanelComponent } from "../toolkit/TabPanelComponent"; import { Chat } from "../../util/Chat"; +import { stendhal } from "stendhal"; /** diff --git a/src/js/stendhal/ui/component/ItemContainerImplementation.ts b/src/js/stendhal/ui/component/ItemContainerImplementation.ts index d22035e5d1..41d506d675 100644 --- a/src/js/stendhal/ui/component/ItemContainerImplementation.ts +++ b/src/js/stendhal/ui/component/ItemContainerImplementation.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { ui } from "../UI"; diff --git a/src/js/stendhal/ui/component/ItemInventoryComponent.ts b/src/js/stendhal/ui/component/ItemInventoryComponent.ts index 6f2662879f..874e829169 100644 --- a/src/js/stendhal/ui/component/ItemInventoryComponent.ts +++ b/src/js/stendhal/ui/component/ItemInventoryComponent.ts @@ -12,7 +12,7 @@ import { Component } from "../toolkit/Component"; import { ItemContainerImplementation } from "./ItemContainerImplementation"; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; /** * handles an item inventory diff --git a/src/js/stendhal/ui/component/MiniMapComponent.ts b/src/js/stendhal/ui/component/MiniMapComponent.ts index 8f01dd678c..4b18c3b095 100644 --- a/src/js/stendhal/ui/component/MiniMapComponent.ts +++ b/src/js/stendhal/ui/component/MiniMapComponent.ts @@ -10,7 +10,6 @@ ***************************************************************************/ declare let marauroa: any; -declare let stendhal: any; import { Component } from "../toolkit/Component"; @@ -18,6 +17,7 @@ import { Player } from "../../entity/Player"; import { Color } from "../../data/color/Color"; import { Canvas, RenderingContext2D } from "util/Types"; +import { stendhal } from "stendhal"; /** diff --git a/src/js/stendhal/ui/component/PlayerStatsComponent.ts b/src/js/stendhal/ui/component/PlayerStatsComponent.ts index 74e44041ec..b2d3b05f62 100644 --- a/src/js/stendhal/ui/component/PlayerStatsComponent.ts +++ b/src/js/stendhal/ui/component/PlayerStatsComponent.ts @@ -23,7 +23,7 @@ import { singletons } from "../../SingletonRepo"; import { Item } from "../../entity/Item"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; /** diff --git a/src/js/stendhal/ui/dialog/ActionContextMenu.ts b/src/js/stendhal/ui/dialog/ActionContextMenu.ts index 003f2258eb..95a6e4c2df 100644 --- a/src/js/stendhal/ui/dialog/ActionContextMenu.ts +++ b/src/js/stendhal/ui/dialog/ActionContextMenu.ts @@ -15,7 +15,7 @@ import { Component } from "../toolkit/Component"; import { ChatInputComponent } from "../component/ChatInputComponent"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; export class ActionContextMenu extends Component { private entity: any; diff --git a/src/js/stendhal/ui/dialog/ApplicationMenuDialog.ts b/src/js/stendhal/ui/dialog/ApplicationMenuDialog.ts index 4cbaa12d5d..c99607780b 100644 --- a/src/js/stendhal/ui/dialog/ApplicationMenuDialog.ts +++ b/src/js/stendhal/ui/dialog/ApplicationMenuDialog.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { singletons } from "../../SingletonRepo"; diff --git a/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts b/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts index 81a667faf5..e24ab61022 100644 --- a/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts +++ b/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts @@ -15,7 +15,7 @@ import { Chat } from "../../util/Chat"; import { singletons } from "../../SingletonRepo"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; /** diff --git a/src/js/stendhal/ui/dialog/EmojiMapDialog.ts b/src/js/stendhal/ui/dialog/EmojiMapDialog.ts index 046cef8264..aaa8b11b9f 100644 --- a/src/js/stendhal/ui/dialog/EmojiMapDialog.ts +++ b/src/js/stendhal/ui/dialog/EmojiMapDialog.ts @@ -14,7 +14,7 @@ import { singletons } from "../../SingletonRepo"; import { Paths } from "../../data/Paths"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; export class EmojiMapDialog extends DialogContentComponent { diff --git a/src/js/stendhal/ui/dialog/ImageViewerDialog.ts b/src/js/stendhal/ui/dialog/ImageViewerDialog.ts index a72c518f88..1b37fe4da2 100644 --- a/src/js/stendhal/ui/dialog/ImageViewerDialog.ts +++ b/src/js/stendhal/ui/dialog/ImageViewerDialog.ts @@ -12,7 +12,7 @@ import { Component } from "../toolkit/Component"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; /** * a dialog to display images diff --git a/src/js/stendhal/ui/dialog/SettingsDialog.ts b/src/js/stendhal/ui/dialog/SettingsDialog.ts index 49e8bd3360..783f999577 100644 --- a/src/js/stendhal/ui/dialog/SettingsDialog.ts +++ b/src/js/stendhal/ui/dialog/SettingsDialog.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { GeneralTab } from "./settings/GeneralTab"; import { InputTab } from "./settings/InputTab"; diff --git a/src/js/stendhal/ui/dialog/TravelLogDialog.ts b/src/js/stendhal/ui/dialog/TravelLogDialog.ts index a273fce417..c589f9080c 100644 --- a/src/js/stendhal/ui/dialog/TravelLogDialog.ts +++ b/src/js/stendhal/ui/dialog/TravelLogDialog.ts @@ -15,7 +15,7 @@ import { ui } from "../UI"; import { UIComponentEnum } from "../UIComponentEnum"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; /** * a dialog to display images diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts index 72291b4759..6d24621989 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts @@ -20,7 +20,7 @@ import { OutfitPaletteColorSelector } from "./OutfitPaletteColorSelector"; import { OutfitPreviewComponent } from "../../component/OutfitPreviewComponent"; declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../../stendhal"; /** diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts index c1095a3503..aaa529aa66 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts @@ -13,7 +13,7 @@ import { singletons } from "../../../SingletonRepo"; import { Paths } from "../../../data/Paths"; import { RenderingContext2D } from "util/Types"; -declare var stendhal: any; +import { stendhal } from "../../../stendhal"; export class OutfitPartSelector { private _part: string; diff --git a/src/js/stendhal/ui/factory/DesktopUserInterfaceFactory.ts b/src/js/stendhal/ui/factory/DesktopUserInterfaceFactory.ts index 21f6ef0826..bafe6e689e 100644 --- a/src/js/stendhal/ui/factory/DesktopUserInterfaceFactory.ts +++ b/src/js/stendhal/ui/factory/DesktopUserInterfaceFactory.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { ChatPanel } from "../ChatPanel"; import { UIComponentEnum } from "../UIComponentEnum"; diff --git a/src/js/stendhal/ui/joystick/Joystick.ts b/src/js/stendhal/ui/joystick/Joystick.ts index a2549051f0..c8cac99521 100644 --- a/src/js/stendhal/ui/joystick/Joystick.ts +++ b/src/js/stendhal/ui/joystick/Joystick.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { JoystickImpl } from "./JoystickImpl"; import { AngleRange } from "../../util/AngleRange"; diff --git a/src/js/stendhal/ui/joystick/JoystickImpl.ts b/src/js/stendhal/ui/joystick/JoystickImpl.ts index 6fb079f445..7e68499845 100644 --- a/src/js/stendhal/ui/joystick/JoystickImpl.ts +++ b/src/js/stendhal/ui/joystick/JoystickImpl.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { ui } from "../UI"; import { SoftwareJoystickController } from "../SoftwareJoystickController"; diff --git a/src/js/stendhal/ui/quickmenu/JoystickButton.ts b/src/js/stendhal/ui/quickmenu/JoystickButton.ts index 62c83dd2cc..6d07e2492a 100644 --- a/src/js/stendhal/ui/quickmenu/JoystickButton.ts +++ b/src/js/stendhal/ui/quickmenu/JoystickButton.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { QuickMenuButton } from "./QuickMenuButton"; import { SoftwareJoystickController } from "../SoftwareJoystickController"; diff --git a/src/js/stendhal/ui/quickmenu/MenuButton.ts b/src/js/stendhal/ui/quickmenu/MenuButton.ts index b3c144a173..6f87c3b1cf 100644 --- a/src/js/stendhal/ui/quickmenu/MenuButton.ts +++ b/src/js/stendhal/ui/quickmenu/MenuButton.ts @@ -12,7 +12,7 @@ import { QuickMenuButton } from "./QuickMenuButton"; import { ui } from "../UI"; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; /** diff --git a/src/js/stendhal/ui/quickmenu/PathFindingButton.ts b/src/js/stendhal/ui/quickmenu/PathFindingButton.ts index e7349068ea..3d31220dca 100644 --- a/src/js/stendhal/ui/quickmenu/PathFindingButton.ts +++ b/src/js/stendhal/ui/quickmenu/PathFindingButton.ts @@ -14,7 +14,7 @@ import { QuickMenuButton } from "./QuickMenuButton"; import { UIComponentEnum } from "../UIComponentEnum"; -declare var stendhal: any; +import { stendhal } from "../../stendhal"; /** diff --git a/src/js/stendhal/ui/quickmenu/QuickMenuButton.ts b/src/js/stendhal/ui/quickmenu/QuickMenuButton.ts index 4edefa32e6..0713803797 100644 --- a/src/js/stendhal/ui/quickmenu/QuickMenuButton.ts +++ b/src/js/stendhal/ui/quickmenu/QuickMenuButton.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { Component } from "../toolkit/Component"; import { ui } from "../UI"; diff --git a/src/js/stendhal/ui/quickmenu/SoundButton.ts b/src/js/stendhal/ui/quickmenu/SoundButton.ts index 39d3eaf0dd..04e7f8a85c 100644 --- a/src/js/stendhal/ui/quickmenu/SoundButton.ts +++ b/src/js/stendhal/ui/quickmenu/SoundButton.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { QuickMenuButton } from "./QuickMenuButton"; import { UIComponentEnum } from "../UIComponentEnum"; diff --git a/src/js/stendhal/ui/toolkit/DialogContentComponent.ts b/src/js/stendhal/ui/toolkit/DialogContentComponent.ts index ea0d133777..b9983ba860 100644 --- a/src/js/stendhal/ui/toolkit/DialogContentComponent.ts +++ b/src/js/stendhal/ui/toolkit/DialogContentComponent.ts @@ -12,9 +12,6 @@ import { Component } from "./Component"; import { FloatingWindow } from "./FloatingWindow"; -declare let stendhal: any; - - /** * Component representing the contents of a floating dialog. */ diff --git a/src/js/stendhal/ui/toolkit/FloatingWindow.ts b/src/js/stendhal/ui/toolkit/FloatingWindow.ts index 87a764bdcf..353c664ed0 100644 --- a/src/js/stendhal/ui/toolkit/FloatingWindow.ts +++ b/src/js/stendhal/ui/toolkit/FloatingWindow.ts @@ -9,10 +9,9 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../../stendhal"; import { Component } from "./Component"; -import { DialogContentComponent } from "./DialogContentComponent"; import { Point } from "../../util/Point"; diff --git a/src/js/stendhal/util/Chat.ts b/src/js/stendhal/util/Chat.ts index 8bda707e37..4f48b652fe 100644 --- a/src/js/stendhal/util/Chat.ts +++ b/src/js/stendhal/util/Chat.ts @@ -9,12 +9,12 @@ * * ***************************************************************************/ +import { stendhal } from "stendhal"; import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { ChatLogComponent } from "../ui/component/ChatLogComponent"; declare let marauroa: any; -declare let stendhal: any; /** diff --git a/src/js/stendhal/util/ChatCompletionHelper.ts b/src/js/stendhal/util/ChatCompletionHelper.ts index 6702940338..a5f6c3ec88 100644 --- a/src/js/stendhal/util/ChatCompletionHelper.ts +++ b/src/js/stendhal/util/ChatCompletionHelper.ts @@ -11,7 +11,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { SlashActionRepo } from "../SlashActionRepo"; diff --git a/src/js/stendhal/util/ConfigManager.ts b/src/js/stendhal/util/ConfigManager.ts index 18caf0eb24..2e7c76fa9b 100644 --- a/src/js/stendhal/util/ConfigManager.ts +++ b/src/js/stendhal/util/ConfigManager.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; import { Point } from "./Point"; diff --git a/src/js/stendhal/util/ElementClickListener.ts b/src/js/stendhal/util/ElementClickListener.ts index 5d444f8770..41572a8785 100644 --- a/src/js/stendhal/util/ElementClickListener.ts +++ b/src/js/stendhal/util/ElementClickListener.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -declare var stendhal: any; +import { stendhal } from "../stendhal"; /** diff --git a/src/js/stendhal/util/JSONLoader.ts b/src/js/stendhal/util/JSONLoader.ts index f68bb9284a..1b6d66da23 100644 --- a/src/js/stendhal/util/JSONLoader.ts +++ b/src/js/stendhal/util/JSONLoader.ts @@ -10,7 +10,7 @@ ***************************************************************************/ declare var marauroa: any; -declare var stendhal: any; +import { stendhal } from "../stendhal"; export class JSONLoader { diff --git a/src/js/stendhal/util/SessionManager.ts b/src/js/stendhal/util/SessionManager.ts index 456e2bbf63..ac8e112032 100644 --- a/src/js/stendhal/util/SessionManager.ts +++ b/src/js/stendhal/util/SessionManager.ts @@ -11,7 +11,7 @@ import { Paths } from "../data/Paths"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; /** diff --git a/src/js/stendhal/util/WeatherRenderer.ts b/src/js/stendhal/util/WeatherRenderer.ts index abf1ff5225..acf0c25791 100644 --- a/src/js/stendhal/util/WeatherRenderer.ts +++ b/src/js/stendhal/util/WeatherRenderer.ts @@ -16,7 +16,7 @@ import { TileStore } from "../data/TileStore"; import { SoundObject } from "../data/sound/SoundFactory"; import { Canvas, RenderingContext2D } from "./Types"; -declare var stendhal: any; +import { stendhal } from "../stendhal"; const weatherLoops = { From 738d3cd830e9932f1441833b1f5de5e549c95eee Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 10 Jan 2026 00:24:12 +0100 Subject: [PATCH 048/162] explicitly define marauroa global variable --- src/js/stendhal/Client.ts | 2 +- src/js/stendhal/EventRegistry.ts | 2 +- src/js/stendhal/SlashActionRepo.ts | 2 +- src/js/stendhal/action/DebugAction.ts | 2 +- src/js/stendhal/action/SlashAction.ts | 2 +- src/js/stendhal/data/CStatus.ts | 2 +- src/js/stendhal/data/TileMap.ts | 2 +- src/js/stendhal/data/sound/LoopedSoundSourceManager.ts | 2 +- src/js/stendhal/data/sound/SoundManager.ts | 2 +- src/js/stendhal/entity/Chest.ts | 2 +- src/js/stendhal/entity/Corpse.ts | 2 +- src/js/stendhal/entity/Creature.ts | 2 +- src/js/stendhal/entity/DomesticAnimal.ts | 2 +- src/js/stendhal/entity/Entity.ts | 2 +- src/js/stendhal/entity/EntityRegistry.ts | 2 +- src/js/stendhal/entity/Food.ts | 2 +- src/js/stendhal/entity/Gate.ts | 2 +- src/js/stendhal/entity/Ground.ts | 2 +- src/js/stendhal/entity/GrowingEntitySpawner.ts | 2 +- src/js/stendhal/entity/Item.ts | 2 +- src/js/stendhal/entity/ItemMap.ts | 2 +- src/js/stendhal/entity/Player.ts | 2 +- src/js/stendhal/entity/PopupInventory.ts | 2 +- src/js/stendhal/entity/Portal.ts | 2 +- src/js/stendhal/entity/RPEntity.ts | 2 +- src/js/stendhal/entity/RPObject.ts | 2 +- src/js/stendhal/entity/TrainingDummy.ts | 2 +- src/js/stendhal/entity/UnknownEntity.ts | 2 +- src/js/stendhal/entity/User.ts | 2 +- src/js/stendhal/entity/Zone.ts | 2 +- src/js/stendhal/event/ChatOptionsEvent.ts | 2 +- src/js/stendhal/event/ExamineEvent.ts | 2 +- src/js/stendhal/event/GroupChangeEvent.ts | 2 +- src/js/stendhal/event/GroupInviteEvent.ts | 2 +- src/js/stendhal/event/SoundEvent.ts | 2 +- src/js/stendhal/event/TradeEvent.ts | 2 +- src/js/stendhal/main.ts | 10 +++++----- src/js/stendhal/sprite/AchievementBanner.ts | 4 +--- src/js/stendhal/ui/UI.ts | 2 +- src/js/stendhal/ui/ViewPort.ts | 2 +- src/js/stendhal/ui/component/BagComponent.ts | 2 +- src/js/stendhal/ui/component/BuddyListComponent.ts | 2 +- src/js/stendhal/ui/component/ChatInputComponent.ts | 2 +- src/js/stendhal/ui/component/GroupMemberComponent.ts | 2 +- src/js/stendhal/ui/component/GroupPanelComponent.ts | 2 +- .../ui/component/ItemContainerImplementation.ts | 2 +- src/js/stendhal/ui/component/KeyringComponent.ts | 2 +- src/js/stendhal/ui/component/MiniMapComponent.ts | 2 +- .../stendhal/ui/component/PlayerEquipmentComponent.ts | 2 +- src/js/stendhal/ui/component/PlayerStatsComponent.ts | 2 +- src/js/stendhal/ui/component/ZoneInfoComponent.ts | 2 +- src/js/stendhal/ui/dialog/ActionContextMenu.ts | 2 +- src/js/stendhal/ui/dialog/ChatOptionsDialog.ts | 2 +- src/js/stendhal/ui/dialog/CreateAccountDialog.ts | 2 +- .../stendhal/ui/dialog/DropQuantitySelectorDialog.ts | 2 +- src/js/stendhal/ui/dialog/EmojiMapDialog.ts | 2 +- src/js/stendhal/ui/dialog/ImageViewerDialog.ts | 2 +- src/js/stendhal/ui/dialog/LoginDialog.ts | 2 +- src/js/stendhal/ui/dialog/TradeDialog.ts | 2 +- src/js/stendhal/ui/dialog/TravelLogDialog.ts | 2 +- src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts | 2 +- src/js/stendhal/ui/dialog/settings/GeneralTab.ts | 2 +- src/js/stendhal/ui/joystick/JoystickImpl.ts | 2 +- src/js/stendhal/util/Chat.ts | 2 +- src/js/stendhal/util/ChatCompletionHelper.ts | 2 +- src/js/stendhal/util/FacingHandler.ts | 2 +- src/js/stendhal/util/JSONLoader.ts | 2 +- src/js/stendhal/util/KeyHandler.ts | 2 +- src/js/stendhal/util/Speech.ts | 2 -- 69 files changed, 72 insertions(+), 76 deletions(-) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index af04fa68f3..3d13c8d3ba 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "./stendhal"; import { PerceptionListener } from "./PerceptionListener"; diff --git a/src/js/stendhal/EventRegistry.ts b/src/js/stendhal/EventRegistry.ts index 192fda76f6..5708b60eaf 100644 --- a/src/js/stendhal/EventRegistry.ts +++ b/src/js/stendhal/EventRegistry.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "./stendhal"; import { RPEntity } from "./entity/RPEntity"; diff --git a/src/js/stendhal/SlashActionRepo.ts b/src/js/stendhal/SlashActionRepo.ts index 99570e7645..b12090863e 100644 --- a/src/js/stendhal/SlashActionRepo.ts +++ b/src/js/stendhal/SlashActionRepo.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "./stendhal"; import { singletons } from "./SingletonRepo"; diff --git a/src/js/stendhal/action/DebugAction.ts b/src/js/stendhal/action/DebugAction.ts index 7df16e5117..7074fe446d 100644 --- a/src/js/stendhal/action/DebugAction.ts +++ b/src/js/stendhal/action/DebugAction.ts @@ -23,7 +23,7 @@ import { Chat } from "../util/Chat"; import { Debug } from "../util/Debug"; import { Paths } from "../data/Paths"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; /** diff --git a/src/js/stendhal/action/SlashAction.ts b/src/js/stendhal/action/SlashAction.ts index 41c86e4126..5c304f9987 100644 --- a/src/js/stendhal/action/SlashAction.ts +++ b/src/js/stendhal/action/SlashAction.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { ParamList } from "./ParamList"; import { Pair } from "../util/Pair"; diff --git a/src/js/stendhal/data/CStatus.ts b/src/js/stendhal/data/CStatus.ts index df4ec65dc4..a0d62cf33b 100644 --- a/src/js/stendhal/data/CStatus.ts +++ b/src/js/stendhal/data/CStatus.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/data/TileMap.ts b/src/js/stendhal/data/TileMap.ts index 66c2f5c2e8..76f9cfbc3d 100644 --- a/src/js/stendhal/data/TileMap.ts +++ b/src/js/stendhal/data/TileMap.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; import { Paths } from "./Paths"; diff --git a/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts b/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts index 5580e293aa..5d2bbeb741 100644 --- a/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts +++ b/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../stendhal"; import { LoopedSoundSource } from "../../entity/LoopedSoundSource"; diff --git a/src/js/stendhal/data/sound/SoundManager.ts b/src/js/stendhal/data/sound/SoundManager.ts index eabadae50b..87b89f9ba7 100644 --- a/src/js/stendhal/data/sound/SoundManager.ts +++ b/src/js/stendhal/data/sound/SoundManager.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../stendhal"; import { SoundFactory } from "./SoundFactory"; diff --git a/src/js/stendhal/entity/Chest.ts b/src/js/stendhal/entity/Chest.ts index 6abcff9e17..e55203e308 100644 --- a/src/js/stendhal/entity/Chest.ts +++ b/src/js/stendhal/entity/Chest.ts @@ -21,7 +21,7 @@ import { ItemInventoryComponent } from "../ui/component/ItemInventoryComponent"; import { Chat } from "../util/Chat"; import { Paths } from "../data/Paths"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index e8c1e9b470..398f370449 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -21,7 +21,7 @@ import { PopupInventory } from "./PopupInventory"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; export class Corpse extends PopupInventory { diff --git a/src/js/stendhal/entity/Creature.ts b/src/js/stendhal/entity/Creature.ts index 9fd20fe16d..0ea549f221 100644 --- a/src/js/stendhal/entity/Creature.ts +++ b/src/js/stendhal/entity/Creature.ts @@ -18,7 +18,7 @@ import { Color } from "../data/color/Color"; import { SkillEffect } from "../sprite/action/SkillEffect"; import { Paths } from "../data/Paths"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; export class Creature extends RPEntity { diff --git a/src/js/stendhal/entity/DomesticAnimal.ts b/src/js/stendhal/entity/DomesticAnimal.ts index 2dcd199cbb..0d11b013f6 100644 --- a/src/js/stendhal/entity/DomesticAnimal.ts +++ b/src/js/stendhal/entity/DomesticAnimal.ts @@ -17,7 +17,7 @@ import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; export class DomesticAnimal extends RPEntity { diff --git a/src/js/stendhal/entity/Entity.ts b/src/js/stendhal/entity/Entity.ts index 4a7b24851e..2b09e83333 100644 --- a/src/js/stendhal/entity/Entity.ts +++ b/src/js/stendhal/entity/Entity.ts @@ -16,7 +16,7 @@ import { RPObject } from "./RPObject"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; /** diff --git a/src/js/stendhal/entity/EntityRegistry.ts b/src/js/stendhal/entity/EntityRegistry.ts index 8b6ff19327..c80566d979 100644 --- a/src/js/stendhal/entity/EntityRegistry.ts +++ b/src/js/stendhal/entity/EntityRegistry.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { Blood } from "./Blood"; import { Chest} from "./Chest"; diff --git a/src/js/stendhal/entity/Food.ts b/src/js/stendhal/entity/Food.ts index f37ada3b26..0025f18dbf 100644 --- a/src/js/stendhal/entity/Food.ts +++ b/src/js/stendhal/entity/Food.ts @@ -14,7 +14,7 @@ import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; export class Food extends Entity { diff --git a/src/js/stendhal/entity/Gate.ts b/src/js/stendhal/entity/Gate.ts index 7da2051a50..3c67c3409f 100644 --- a/src/js/stendhal/entity/Gate.ts +++ b/src/js/stendhal/entity/Gate.ts @@ -15,7 +15,7 @@ import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; export class Gate extends Entity { diff --git a/src/js/stendhal/entity/Ground.ts b/src/js/stendhal/entity/Ground.ts index bb417af624..153101ecbb 100644 --- a/src/js/stendhal/entity/Ground.ts +++ b/src/js/stendhal/entity/Ground.ts @@ -11,7 +11,7 @@ import { Paths } from "../data/Paths"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/entity/GrowingEntitySpawner.ts b/src/js/stendhal/entity/GrowingEntitySpawner.ts index d625826582..cb0c2c9d89 100644 --- a/src/js/stendhal/entity/GrowingEntitySpawner.ts +++ b/src/js/stendhal/entity/GrowingEntitySpawner.ts @@ -15,7 +15,7 @@ import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; export class GrowingEntitySpawner extends Entity { diff --git a/src/js/stendhal/entity/Item.ts b/src/js/stendhal/entity/Item.ts index 27a338be8c..c8a0a6fa1c 100644 --- a/src/js/stendhal/entity/Item.ts +++ b/src/js/stendhal/entity/Item.ts @@ -17,7 +17,7 @@ import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; export class Item extends Entity { diff --git a/src/js/stendhal/entity/ItemMap.ts b/src/js/stendhal/entity/ItemMap.ts index 23f49b9988..016adb8a9d 100644 --- a/src/js/stendhal/entity/ItemMap.ts +++ b/src/js/stendhal/entity/ItemMap.ts @@ -15,7 +15,7 @@ import { MenuItem } from "../action/MenuItem"; const config = singletons.getConfigManager(); -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; const defaultUse = { title: "Use", diff --git a/src/js/stendhal/entity/Player.ts b/src/js/stendhal/entity/Player.ts index 4f29d21c28..694631716e 100644 --- a/src/js/stendhal/entity/Player.ts +++ b/src/js/stendhal/entity/Player.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; import { RPEntity } from "./RPEntity"; diff --git a/src/js/stendhal/entity/PopupInventory.ts b/src/js/stendhal/entity/PopupInventory.ts index ab51130afd..2f1e19a6ed 100644 --- a/src/js/stendhal/entity/PopupInventory.ts +++ b/src/js/stendhal/entity/PopupInventory.ts @@ -13,7 +13,7 @@ import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; import { RPObject } from "./RPObject"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; export class PopupInventory extends Entity { diff --git a/src/js/stendhal/entity/Portal.ts b/src/js/stendhal/entity/Portal.ts index 5142b226bb..7d68550747 100644 --- a/src/js/stendhal/entity/Portal.ts +++ b/src/js/stendhal/entity/Portal.ts @@ -15,7 +15,7 @@ import { MenuItem } from "../action/MenuItem"; import { Color } from "../data/color/Color"; import { Paths } from "../data/Paths"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; export class Portal extends Entity { diff --git a/src/js/stendhal/entity/RPEntity.ts b/src/js/stendhal/entity/RPEntity.ts index cbc373392f..9c5ace8f48 100644 --- a/src/js/stendhal/entity/RPEntity.ts +++ b/src/js/stendhal/entity/RPEntity.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; import { ActiveEntity } from "./ActiveEntity"; diff --git a/src/js/stendhal/entity/RPObject.ts b/src/js/stendhal/entity/RPObject.ts index bac2ac041d..6e597bd0d3 100644 --- a/src/js/stendhal/entity/RPObject.ts +++ b/src/js/stendhal/entity/RPObject.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** diff --git a/src/js/stendhal/entity/TrainingDummy.ts b/src/js/stendhal/entity/TrainingDummy.ts index 621e8abadf..2da3b82ba3 100644 --- a/src/js/stendhal/entity/TrainingDummy.ts +++ b/src/js/stendhal/entity/TrainingDummy.ts @@ -12,7 +12,7 @@ import { Paths } from "../data/Paths"; import { NPC } from "./NPC"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/entity/UnknownEntity.ts b/src/js/stendhal/entity/UnknownEntity.ts index df40496262..ab71ecb2a9 100644 --- a/src/js/stendhal/entity/UnknownEntity.ts +++ b/src/js/stendhal/entity/UnknownEntity.ts @@ -11,7 +11,7 @@ import { Entity } from "./Entity"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; export class UnknownEntity extends Entity { diff --git a/src/js/stendhal/entity/User.ts b/src/js/stendhal/entity/User.ts index f121f8dc4f..0808be34e8 100644 --- a/src/js/stendhal/entity/User.ts +++ b/src/js/stendhal/entity/User.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; import { Entity } from "./Entity"; diff --git a/src/js/stendhal/entity/Zone.ts b/src/js/stendhal/entity/Zone.ts index 470acaf4f7..a9f3357aba 100644 --- a/src/js/stendhal/entity/Zone.ts +++ b/src/js/stendhal/entity/Zone.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; import { Entity } from "./Entity"; diff --git a/src/js/stendhal/event/ChatOptionsEvent.ts b/src/js/stendhal/event/ChatOptionsEvent.ts index f16cc023a4..46165e6de8 100644 --- a/src/js/stendhal/event/ChatOptionsEvent.ts +++ b/src/js/stendhal/event/ChatOptionsEvent.ts @@ -13,7 +13,7 @@ import { Chat } from "../util/Chat"; import { ChatOptionsDialog } from "../ui/dialog/ChatOptionsDialog"; import { RPEvent } from "./RPEvent"; -declare var marauroa: any +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * shows an image for a detail view diff --git a/src/js/stendhal/event/ExamineEvent.ts b/src/js/stendhal/event/ExamineEvent.ts index 3a79d3f649..e4abba9bf5 100644 --- a/src/js/stendhal/event/ExamineEvent.ts +++ b/src/js/stendhal/event/ExamineEvent.ts @@ -13,7 +13,7 @@ import { ImageViewerDialog } from "../ui/dialog/ImageViewerDialog"; import { ui } from "../ui/UI"; import { RPEvent } from "./RPEvent"; -declare var marauroa: any +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * shows an image for a detail view diff --git a/src/js/stendhal/event/GroupChangeEvent.ts b/src/js/stendhal/event/GroupChangeEvent.ts index 4f6836232a..e99f53a66b 100644 --- a/src/js/stendhal/event/GroupChangeEvent.ts +++ b/src/js/stendhal/event/GroupChangeEvent.ts @@ -15,7 +15,7 @@ import { UIComponentEnum } from "../ui/UIComponentEnum"; import { GroupPanelComponent } from "../ui/component/GroupPanelComponent"; import { stendhal } from "../stendhal"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * handles player trade events diff --git a/src/js/stendhal/event/GroupInviteEvent.ts b/src/js/stendhal/event/GroupInviteEvent.ts index dda3f7af48..3f84849985 100644 --- a/src/js/stendhal/event/GroupInviteEvent.ts +++ b/src/js/stendhal/event/GroupInviteEvent.ts @@ -15,7 +15,7 @@ import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { GroupPanelComponent } from "../ui/component/GroupPanelComponent"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * handles player trade events diff --git a/src/js/stendhal/event/SoundEvent.ts b/src/js/stendhal/event/SoundEvent.ts index 3a85e9d6bb..812f258408 100644 --- a/src/js/stendhal/event/SoundEvent.ts +++ b/src/js/stendhal/event/SoundEvent.ts @@ -15,7 +15,7 @@ import { RPEvent } from "./RPEvent"; import { SoundID } from "../data/sound/SoundID"; import { SoundManager } from "../data/sound/SoundManager"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/event/TradeEvent.ts b/src/js/stendhal/event/TradeEvent.ts index 7216a57733..9652168503 100644 --- a/src/js/stendhal/event/TradeEvent.ts +++ b/src/js/stendhal/event/TradeEvent.ts @@ -18,7 +18,7 @@ import { ui } from "../ui/UI"; import { RPEvent } from "./RPEvent"; import { stendhal } from "../stendhal"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * handles player trade events diff --git a/src/js/stendhal/main.ts b/src/js/stendhal/main.ts index af2208441e..9275830296 100644 --- a/src/js/stendhal/main.ts +++ b/src/js/stendhal/main.ts @@ -9,7 +9,10 @@ * * ***************************************************************************/ +(window as any).marauroa = (window as any).marauroa || {}; + +import { stendhal } from "./stendhal"; import { Client } from "./Client"; declare var require: any; @@ -20,19 +23,16 @@ require("marauroa/message-factory"); require("marauroa/perception"); require("marauroa/rpfactory"); require("marauroa/deserializer"); -require("marauroa/build"); +let build = require("marauroa/build"); require("./data/sha3"); -declare var stendhal: any; /** * Initializes "stendhal" object. */ function initGlobals() { - const win = window as any; - //win.marauroa = win.marauroa || {}; // marauroa object should already be intialized - win.stendhal = win.stendhal || {}; + build.version(stendhal); stendhal.main = Client.get(); } diff --git a/src/js/stendhal/sprite/AchievementBanner.ts b/src/js/stendhal/sprite/AchievementBanner.ts index 5123635aeb..a67dddd57b 100644 --- a/src/js/stendhal/sprite/AchievementBanner.ts +++ b/src/js/stendhal/sprite/AchievementBanner.ts @@ -14,9 +14,7 @@ import { BackgroundPainter } from "../util/BackgroundPainter"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; - -declare const stendhal: any; - +import { stendhal } from "../stendhal"; export class AchievementBanner extends TextBubble { diff --git a/src/js/stendhal/ui/UI.ts b/src/js/stendhal/ui/UI.ts index 816102cbd0..c56b912ac0 100644 --- a/src/js/stendhal/ui/UI.ts +++ b/src/js/stendhal/ui/UI.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; import { UIComponentEnum } from "./UIComponentEnum"; diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index 74ec698bfe..0850c4d3e8 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; import { HeldObject } from "./HeldObject"; diff --git a/src/js/stendhal/ui/component/BagComponent.ts b/src/js/stendhal/ui/component/BagComponent.ts index fd1d9ff89d..f342539ee8 100644 --- a/src/js/stendhal/ui/component/BagComponent.ts +++ b/src/js/stendhal/ui/component/BagComponent.ts @@ -11,7 +11,7 @@ import { ItemInventoryComponent } from "./ItemInventoryComponent"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; export class BagComponent extends ItemInventoryComponent { diff --git a/src/js/stendhal/ui/component/BuddyListComponent.ts b/src/js/stendhal/ui/component/BuddyListComponent.ts index 273feacfaa..6385ed132c 100644 --- a/src/js/stendhal/ui/component/BuddyListComponent.ts +++ b/src/js/stendhal/ui/component/BuddyListComponent.ts @@ -20,7 +20,7 @@ import { Paths } from "../../data/Paths"; import { stendhal } from "stendhal"; -declare let marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * displays the player stats diff --git a/src/js/stendhal/ui/component/ChatInputComponent.ts b/src/js/stendhal/ui/component/ChatInputComponent.ts index 197d08e697..1790452679 100644 --- a/src/js/stendhal/ui/component/ChatInputComponent.ts +++ b/src/js/stendhal/ui/component/ChatInputComponent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare let marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { ChatPanel } from "../ChatPanel"; import { ui } from "../UI"; diff --git a/src/js/stendhal/ui/component/GroupMemberComponent.ts b/src/js/stendhal/ui/component/GroupMemberComponent.ts index b2942f29b4..26649d13de 100644 --- a/src/js/stendhal/ui/component/GroupMemberComponent.ts +++ b/src/js/stendhal/ui/component/GroupMemberComponent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare let marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { ChatInputComponent } from "./ChatInputComponent"; diff --git a/src/js/stendhal/ui/component/GroupPanelComponent.ts b/src/js/stendhal/ui/component/GroupPanelComponent.ts index a277f94395..0c44d78b73 100644 --- a/src/js/stendhal/ui/component/GroupPanelComponent.ts +++ b/src/js/stendhal/ui/component/GroupPanelComponent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare let marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { ChatInputComponent } from "./ChatInputComponent"; import { GroupMemberComponent } from "./GroupMemberComponent"; diff --git a/src/js/stendhal/ui/component/ItemContainerImplementation.ts b/src/js/stendhal/ui/component/ItemContainerImplementation.ts index 41d506d675..48caeb0729 100644 --- a/src/js/stendhal/ui/component/ItemContainerImplementation.ts +++ b/src/js/stendhal/ui/component/ItemContainerImplementation.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../stendhal"; import { ui } from "../UI"; diff --git a/src/js/stendhal/ui/component/KeyringComponent.ts b/src/js/stendhal/ui/component/KeyringComponent.ts index a5da2fb9bc..85e0c476fa 100644 --- a/src/js/stendhal/ui/component/KeyringComponent.ts +++ b/src/js/stendhal/ui/component/KeyringComponent.ts @@ -11,7 +11,7 @@ import { ItemInventoryComponent } from "./ItemInventoryComponent"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; export class KeyringComponent extends ItemInventoryComponent { diff --git a/src/js/stendhal/ui/component/MiniMapComponent.ts b/src/js/stendhal/ui/component/MiniMapComponent.ts index 4b18c3b095..a4ac3fd6ba 100644 --- a/src/js/stendhal/ui/component/MiniMapComponent.ts +++ b/src/js/stendhal/ui/component/MiniMapComponent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare let marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { Component } from "../toolkit/Component"; diff --git a/src/js/stendhal/ui/component/PlayerEquipmentComponent.ts b/src/js/stendhal/ui/component/PlayerEquipmentComponent.ts index 50bb097baa..240109da5c 100644 --- a/src/js/stendhal/ui/component/PlayerEquipmentComponent.ts +++ b/src/js/stendhal/ui/component/PlayerEquipmentComponent.ts @@ -12,7 +12,7 @@ import { Component } from "../toolkit/Component"; import { ItemContainerImplementation } from "./ItemContainerImplementation"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * manage the equipment which is used by the player diff --git a/src/js/stendhal/ui/component/PlayerStatsComponent.ts b/src/js/stendhal/ui/component/PlayerStatsComponent.ts index b2d3b05f62..eee0d9b169 100644 --- a/src/js/stendhal/ui/component/PlayerStatsComponent.ts +++ b/src/js/stendhal/ui/component/PlayerStatsComponent.ts @@ -22,7 +22,7 @@ import { singletons } from "../../SingletonRepo"; import { Item } from "../../entity/Item"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../stendhal"; diff --git a/src/js/stendhal/ui/component/ZoneInfoComponent.ts b/src/js/stendhal/ui/component/ZoneInfoComponent.ts index d4490a2395..3a00fbbe19 100644 --- a/src/js/stendhal/ui/component/ZoneInfoComponent.ts +++ b/src/js/stendhal/ui/component/ZoneInfoComponent.ts @@ -11,7 +11,7 @@ import { Component } from "../toolkit/Component"; -declare let marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * zone info diff --git a/src/js/stendhal/ui/dialog/ActionContextMenu.ts b/src/js/stendhal/ui/dialog/ActionContextMenu.ts index 95a6e4c2df..1b9216c93f 100644 --- a/src/js/stendhal/ui/dialog/ActionContextMenu.ts +++ b/src/js/stendhal/ui/dialog/ActionContextMenu.ts @@ -14,7 +14,7 @@ import { UIComponentEnum } from "../UIComponentEnum"; import { Component } from "../toolkit/Component"; import { ChatInputComponent } from "../component/ChatInputComponent"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../stendhal"; export class ActionContextMenu extends Component { diff --git a/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts b/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts index e24ab61022..de5d08dd1b 100644 --- a/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts +++ b/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts @@ -14,7 +14,7 @@ import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { Chat } from "../../util/Chat"; import { singletons } from "../../SingletonRepo"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../stendhal"; diff --git a/src/js/stendhal/ui/dialog/CreateAccountDialog.ts b/src/js/stendhal/ui/dialog/CreateAccountDialog.ts index 0909bd725b..595178519a 100644 --- a/src/js/stendhal/ui/dialog/CreateAccountDialog.ts +++ b/src/js/stendhal/ui/dialog/CreateAccountDialog.ts @@ -13,7 +13,7 @@ import { ui } from "../UI"; import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { LoginDialog } from "./LoginDialog"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * a dialog to enter username and password diff --git a/src/js/stendhal/ui/dialog/DropQuantitySelectorDialog.ts b/src/js/stendhal/ui/dialog/DropQuantitySelectorDialog.ts index 5c2da2930c..436185d06a 100644 --- a/src/js/stendhal/ui/dialog/DropQuantitySelectorDialog.ts +++ b/src/js/stendhal/ui/dialog/DropQuantitySelectorDialog.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { Component } from "../toolkit/Component"; import { singletons } from "../../SingletonRepo"; diff --git a/src/js/stendhal/ui/dialog/EmojiMapDialog.ts b/src/js/stendhal/ui/dialog/EmojiMapDialog.ts index aaa8b11b9f..8138d0d1ef 100644 --- a/src/js/stendhal/ui/dialog/EmojiMapDialog.ts +++ b/src/js/stendhal/ui/dialog/EmojiMapDialog.ts @@ -13,7 +13,7 @@ import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { singletons } from "../../SingletonRepo"; import { Paths } from "../../data/Paths"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../stendhal"; diff --git a/src/js/stendhal/ui/dialog/ImageViewerDialog.ts b/src/js/stendhal/ui/dialog/ImageViewerDialog.ts index 1b37fe4da2..d0c12d9fc0 100644 --- a/src/js/stendhal/ui/dialog/ImageViewerDialog.ts +++ b/src/js/stendhal/ui/dialog/ImageViewerDialog.ts @@ -11,7 +11,7 @@ import { Component } from "../toolkit/Component"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../stendhal"; /** diff --git a/src/js/stendhal/ui/dialog/LoginDialog.ts b/src/js/stendhal/ui/dialog/LoginDialog.ts index 4c244428c9..c64ee550b5 100644 --- a/src/js/stendhal/ui/dialog/LoginDialog.ts +++ b/src/js/stendhal/ui/dialog/LoginDialog.ts @@ -14,7 +14,7 @@ import { ui } from "../UI"; import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { CreateAccountDialog } from "./CreateAccountDialog"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * a dialog to enter username and password diff --git a/src/js/stendhal/ui/dialog/TradeDialog.ts b/src/js/stendhal/ui/dialog/TradeDialog.ts index 691866241d..c0d16d1cb5 100644 --- a/src/js/stendhal/ui/dialog/TradeDialog.ts +++ b/src/js/stendhal/ui/dialog/TradeDialog.ts @@ -15,7 +15,7 @@ import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { ui } from "../UI"; import { UIComponentEnum } from "../UIComponentEnum"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** * a dialog to display images diff --git a/src/js/stendhal/ui/dialog/TravelLogDialog.ts b/src/js/stendhal/ui/dialog/TravelLogDialog.ts index c589f9080c..ceb0910047 100644 --- a/src/js/stendhal/ui/dialog/TravelLogDialog.ts +++ b/src/js/stendhal/ui/dialog/TravelLogDialog.ts @@ -14,7 +14,7 @@ import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { ui } from "../UI"; import { UIComponentEnum } from "../UIComponentEnum"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../stendhal"; /** diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts index 6d24621989..a6c485ae73 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts @@ -19,7 +19,7 @@ import { OutfitPaletteColorSelector } from "./OutfitPaletteColorSelector"; import { OutfitPreviewComponent } from "../../component/OutfitPreviewComponent"; -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../../stendhal"; diff --git a/src/js/stendhal/ui/dialog/settings/GeneralTab.ts b/src/js/stendhal/ui/dialog/settings/GeneralTab.ts index e57253c937..a739b74b75 100644 --- a/src/js/stendhal/ui/dialog/settings/GeneralTab.ts +++ b/src/js/stendhal/ui/dialog/settings/GeneralTab.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { AbstractSettingsTab } from "./AbstractSettingsTab"; diff --git a/src/js/stendhal/ui/joystick/JoystickImpl.ts b/src/js/stendhal/ui/joystick/JoystickImpl.ts index 7e68499845..021f8f5d8a 100644 --- a/src/js/stendhal/ui/joystick/JoystickImpl.ts +++ b/src/js/stendhal/ui/joystick/JoystickImpl.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../../stendhal"; import { ui } from "../UI"; diff --git a/src/js/stendhal/util/Chat.ts b/src/js/stendhal/util/Chat.ts index 4f48b652fe..109ca33ccc 100644 --- a/src/js/stendhal/util/Chat.ts +++ b/src/js/stendhal/util/Chat.ts @@ -14,7 +14,7 @@ import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { ChatLogComponent } from "../ui/component/ChatLogComponent"; -declare let marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; /** diff --git a/src/js/stendhal/util/ChatCompletionHelper.ts b/src/js/stendhal/util/ChatCompletionHelper.ts index a5f6c3ec88..1288d7c74d 100644 --- a/src/js/stendhal/util/ChatCompletionHelper.ts +++ b/src/js/stendhal/util/ChatCompletionHelper.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; import { SlashActionRepo } from "../SlashActionRepo"; diff --git a/src/js/stendhal/util/FacingHandler.ts b/src/js/stendhal/util/FacingHandler.ts index 2ca41acd01..539cdc60f2 100644 --- a/src/js/stendhal/util/FacingHandler.ts +++ b/src/js/stendhal/util/FacingHandler.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { Direction } from "./Direction"; diff --git a/src/js/stendhal/util/JSONLoader.ts b/src/js/stendhal/util/JSONLoader.ts index 1b6d66da23..aa9e4d934b 100644 --- a/src/js/stendhal/util/JSONLoader.ts +++ b/src/js/stendhal/util/JSONLoader.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/util/KeyHandler.ts b/src/js/stendhal/util/KeyHandler.ts index 7906657689..b8f8f22c17 100644 --- a/src/js/stendhal/util/KeyHandler.ts +++ b/src/js/stendhal/util/KeyHandler.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -declare var marauroa: any; +var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { ChatCompletionHelper } from "./ChatCompletionHelper"; import { Direction } from "./Direction"; diff --git a/src/js/stendhal/util/Speech.ts b/src/js/stendhal/util/Speech.ts index 0808b6b3a5..a485844d1c 100644 --- a/src/js/stendhal/util/Speech.ts +++ b/src/js/stendhal/util/Speech.ts @@ -11,8 +11,6 @@ import { RenderingContext2D } from "./Types"; -declare var stendhal: any - export class Speech { // space to be left at the beginning and end of line in pixels From 38934a8c094f7d55d141c62ca69d8fe1d89d5d2f Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 13 Jan 2026 09:13:54 +0100 Subject: [PATCH 049/162] fixed local builds after esbuild migration --- buildtools/ant_modules/dist.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index b2e16cea56..28a56ff36c 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -694,7 +694,7 @@ export function version(stendhal) { - + From 6a4009c790e3ecb8526fa60092ec4130b4153f9c Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 13 Jan 2026 23:07:55 +0100 Subject: [PATCH 050/162] fixed build --- buildtools/ant_modules/dist.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index 28a56ff36c..e35e2d814a 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -691,10 +691,12 @@ export function version(stendhal) { //CI } + + - - - + + + From 6c6462149692076185135f6370091c35204b26d6 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 13 Jan 2026 18:55:56 -0800 Subject: [PATCH 051/162] Don't try to clean removed 'tiled' directory --- buildtools/ant_modules/tools.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/buildtools/ant_modules/tools.xml b/buildtools/ant_modules/tools.xml index cf018c871d..624ab03f5d 100644 --- a/buildtools/ant_modules/tools.xml +++ b/buildtools/ant_modules/tools.xml @@ -55,7 +55,6 @@ - From 14d7e046becfc2a4b1fee7fe6c2aa4c9cd361c0d Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 13 Jan 2026 19:00:22 -0800 Subject: [PATCH 052/162] Process ant build files in 'cleanwhitespace' target --- buildtools/ant_modules/tools.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/buildtools/ant_modules/tools.xml b/buildtools/ant_modules/tools.xml index 624ab03f5d..2083c75fd8 100644 --- a/buildtools/ant_modules/tools.xml +++ b/buildtools/ant_modules/tools.xml @@ -57,6 +57,15 @@ + + + + + + + + + From 2abc8df6668f6e17332ad57a7e56898badc646df Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 13 Jan 2026 19:07:26 -0800 Subject: [PATCH 053/162] Run 'ant cleanwhitespace' --- buildtools/ant_modules/dist.xml | 4 ++-- src/js/stendhal/entity/EntityRegistry.ts | 1 - src/js/stendhal/event/ShowOutfitListEvent.ts | 2 +- src/js/stendhal/main.ts | 2 +- src/js/stendhal/stendhal.ts | 2 +- src/js/stendhal/util/Types.ts | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index e35e2d814a..19677569f6 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -672,7 +672,7 @@ - + @@ -725,7 +725,7 @@ export function version(stendhal) { - + diff --git a/src/js/stendhal/entity/EntityRegistry.ts b/src/js/stendhal/entity/EntityRegistry.ts index c80566d979..92971c3239 100644 --- a/src/js/stendhal/entity/EntityRegistry.ts +++ b/src/js/stendhal/entity/EntityRegistry.ts @@ -78,4 +78,3 @@ export class EntityRegistry { marauroa.rpobjectFactory["weather_entity"] = InvisibleEntity; } } - diff --git a/src/js/stendhal/event/ShowOutfitListEvent.ts b/src/js/stendhal/event/ShowOutfitListEvent.ts index 9995fdd7af..bc9e8cfec4 100644 --- a/src/js/stendhal/event/ShowOutfitListEvent.ts +++ b/src/js/stendhal/event/ShowOutfitListEvent.ts @@ -53,7 +53,7 @@ export class ShowOutfitListEvent extends RPEvent { const content = new class extends DialogContentComponent { }("empty-div-template"); content.componentElement.classList.add("shopsign"); - + const table = document.createElement("table"); table.className = "shoptable"; content.componentElement.appendChild(table); diff --git a/src/js/stendhal/main.ts b/src/js/stendhal/main.ts index 9275830296..f44169b767 100644 --- a/src/js/stendhal/main.ts +++ b/src/js/stendhal/main.ts @@ -44,4 +44,4 @@ function initGlobals() { document.addEventListener('DOMContentLoaded', () => stendhal.main.startup()); window.addEventListener('error', (error: ErrorEvent) => stendhal.main.onError(error)); -})(); \ No newline at end of file +})(); diff --git a/src/js/stendhal/stendhal.ts b/src/js/stendhal/stendhal.ts index 7c9adb59b1..743cc4d6f3 100644 --- a/src/js/stendhal/stendhal.ts +++ b/src/js/stendhal/stendhal.ts @@ -11,4 +11,4 @@ export class stendhal { static main: any; static actions: any; static players: any -} \ No newline at end of file +} diff --git a/src/js/stendhal/util/Types.ts b/src/js/stendhal/util/Types.ts index 49dbf3ca90..34ccdcdf56 100644 --- a/src/js/stendhal/util/Types.ts +++ b/src/js/stendhal/util/Types.ts @@ -1,2 +1,2 @@ export type RenderingContext2D = CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D; -export type Canvas = HTMLCanvasElement | OffscreenCanvas; \ No newline at end of file +export type Canvas = HTMLCanvasElement | OffscreenCanvas; From a13ee36fe817963ef637cb486774ca428b471fa6 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Wed, 14 Jan 2026 22:56:50 +0100 Subject: [PATCH 054/162] converted all events to TypeScript --- src/js/stendhal/EventRegistry.ts | 96 +++---------------- src/js/stendhal/event/AttackEvent.ts | 38 ++++++++ src/js/stendhal/event/BestiaryEvent.ts | 2 +- .../stendhal/event/GlobalVisualEffectEvent.ts | 20 ++++ src/js/stendhal/event/ImageEvent.ts | 20 ++++ src/js/stendhal/event/PrivateTextEvent.ts | 53 ++++++++++ .../stendhal/event/ReachedAchievementEvent.ts | 27 ++++++ src/js/stendhal/event/TextEvent.ts | 31 ++++++ src/js/stendhal/event/TransitionGraphEvent.ts | 21 ++++ 9 files changed, 225 insertions(+), 83 deletions(-) create mode 100644 src/js/stendhal/event/AttackEvent.ts create mode 100644 src/js/stendhal/event/GlobalVisualEffectEvent.ts create mode 100644 src/js/stendhal/event/ImageEvent.ts create mode 100644 src/js/stendhal/event/PrivateTextEvent.ts create mode 100644 src/js/stendhal/event/ReachedAchievementEvent.ts create mode 100644 src/js/stendhal/event/TextEvent.ts create mode 100644 src/js/stendhal/event/TransitionGraphEvent.ts diff --git a/src/js/stendhal/EventRegistry.ts b/src/js/stendhal/EventRegistry.ts index 5708b60eaf..9f953a4059 100644 --- a/src/js/stendhal/EventRegistry.ts +++ b/src/js/stendhal/EventRegistry.ts @@ -30,6 +30,13 @@ import { SoundEvent } from "./event/SoundEvent"; import { TradeEvent } from "./event/TradeEvent"; import { ViewChangeEvent } from "./event/ViewChangeEvent"; import { Chat } from "./util/Chat"; +import { AttackEvent } from "event/AttackEvent"; +import { GlobalVisualEffectEvent } from "event/GlobalVisualEffectEvent"; +import { ImageEvent } from "event/ImageEvent"; +import { ReachedAchievementEvent } from "event/ReachedAchievementEvent"; +import { TextEvent } from "event/TextEvent"; +import { TransitionGraphEvent } from "event/TransitionGraphEvent"; +import { PrivateTextEvent } from "event/PrivateTextEvent"; export class EventRegistry { @@ -74,104 +81,29 @@ export class EventRegistry { this.register("progress_status_event", new ProgressStatusEvent()); this.register("trade_state_change_event", new TradeEvent()); - this.register("attack", { - execute: function(entity: RPEntity) { - var target = entity.getAttackTarget(); - if (!target) { - return; - } - if (this.hasOwnProperty("hit")) { - var damage = parseInt(this["damage"], 10); - if (damage !== 0) { - target.onDamaged(entity, damage); - } else { - target.onBlocked(entity); - } - } else { - target.onMissed(entity); - } - entity.onAttackPerformed(parseInt(this["type"], 10), this.hasOwnProperty("ranged"), this["weapon"]); - } - }); // attack + this.register("attack", new AttackEvent()); this.register("bestiary", new BestiaryEvent()); - this.register("global_visual_effect", { - execute: function(rpobject: RPObject) { - // TODO: new GlobalVisualEffectEvent(); - } - }); // global_visual_effect + this.register("global_visual_effect", new GlobalVisualEffectEvent()); - this.register("image_event", { - execute: function(rpobject: RPObject) { - // TODO: new ImageEffectEvent(); - console.log("image_event", this, rpobject); - } - }); // image_event + this.register("image_event", new ImageEvent()); this.register("player_logged_on", new PlayerLoggedOnEvent()); this.register("player_logged_out", new PlayerLoggedOutEvent()); - this.register("private_text", { - soundTextEvents: { - "privmsg": true, - "support": true, - "tutorial": true - }, + this.register("private_text", new PrivateTextEvent()); - execute: function(rpobject: RPObject) { - const ttype = this["texttype"].toLowerCase(); - const msg = this["text"].replace(/\\r\\n/g, "\n").replace(/\\r/g, "\n"); - - let profile; - if (this.hasOwnProperty("profile")) { - profile = this["profile"]; - } else if (ttype === "tutorial") { - profile = "floattingladynpc"; - } - - if (ttype === "server" && msg.includes("\n")) { - Chat.log(ttype, msg.split("\n"), undefined, profile); - } else { - // scene settings messages should not disturb playing, just create some atmosphere - const headed = ttype !== "scene_setting"; - Chat.log(ttype, msg, undefined, profile, headed); - } - - // play notification sound - const notif = stendhal.config.get("chat.private.sound"); - if (notif && this.soundTextEvents[ttype]) { - stendhal.sound.playGlobalizedEffect(notif); - } - } - }); // private_text - - this.register("reached_achievement", { - execute: function(rpobject: RPObject) { - stendhal.ui.gamewindow.addAchievementNotif(this["category"], this["title"], this["description"]); - } - }); // reached_achievement + this.register("reached_achievement", new ReachedAchievementEvent()); this.register("show_item_list", new ShowItemListEvent()); this.register("show_outfit_list", new ShowOutfitListEvent()); this.register("sound_event", new SoundEvent()); - this.register("text", { - execute: function(entity: RPEntity) { - if (this.hasOwnProperty("range")) { - entity.say(this["text"], this["range"]); - } else { - entity.say(this["text"]); - } - } - }); // text + this.register("text", new TextEvent()); - this.register("transition_graph", { - execute: function(rpobject: RPObject) { - // TODO: new TransitionGraphEvent(); - } - }); // transition_graph + this.register("transition_graph", new TransitionGraphEvent()); this.register("view_change", new ViewChangeEvent()); } diff --git a/src/js/stendhal/event/AttackEvent.ts b/src/js/stendhal/event/AttackEvent.ts new file mode 100644 index 0000000000..5c2ebbc947 --- /dev/null +++ b/src/js/stendhal/event/AttackEvent.ts @@ -0,0 +1,38 @@ +/*************************************************************************** + * (C) Copyright 2005-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { RPEvent } from "./RPEvent"; + +export class AttackEvent extends RPEvent { + + public damage!: string; + public type!: string; + public weapon!: string; + + public execute(entity: any): void { + let target = entity.getAttackTarget(); + if (!target) { + return; + } + if (this.hasOwnProperty("hit")) { + var damage = parseInt(this["damage"], 10); + if (damage !== 0) { + target.onDamaged(entity, damage); + } else { + target.onBlocked(entity); + } + } else { + target.onMissed(entity); + } + entity.onAttackPerformed(parseInt(this["type"], 10), this.hasOwnProperty("ranged"), this["weapon"]); + } + +}; diff --git a/src/js/stendhal/event/BestiaryEvent.ts b/src/js/stendhal/event/BestiaryEvent.ts index 0432cff13f..5c2af7af2b 100644 --- a/src/js/stendhal/event/BestiaryEvent.ts +++ b/src/js/stendhal/event/BestiaryEvent.ts @@ -24,7 +24,7 @@ export class BestiaryEvent extends RPEvent { enemies!: string; - execute(entity: any) { + execute(_entity: any) { if (!this.hasOwnProperty("enemies")) { console.error("Event does not have \"enemies\" attribute"); return; diff --git a/src/js/stendhal/event/GlobalVisualEffectEvent.ts b/src/js/stendhal/event/GlobalVisualEffectEvent.ts new file mode 100644 index 0000000000..382b56566e --- /dev/null +++ b/src/js/stendhal/event/GlobalVisualEffectEvent.ts @@ -0,0 +1,20 @@ +/*************************************************************************** + * (C) Copyright 2005-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { RPEvent } from "./RPEvent"; + +export class GlobalVisualEffectEvent extends RPEvent { + + public execute(_entity: any): void { + // not implemented + } + +}; diff --git a/src/js/stendhal/event/ImageEvent.ts b/src/js/stendhal/event/ImageEvent.ts new file mode 100644 index 0000000000..e898e18c58 --- /dev/null +++ b/src/js/stendhal/event/ImageEvent.ts @@ -0,0 +1,20 @@ +/*************************************************************************** + * (C) Copyright 2005-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { RPEvent } from "./RPEvent"; + +export class ImageEvent extends RPEvent { + + public execute(_entity: any): void { + // not implemented + } + +}; diff --git a/src/js/stendhal/event/PrivateTextEvent.ts b/src/js/stendhal/event/PrivateTextEvent.ts new file mode 100644 index 0000000000..775b8532f8 --- /dev/null +++ b/src/js/stendhal/event/PrivateTextEvent.ts @@ -0,0 +1,53 @@ +/*************************************************************************** + * (C) Copyright 2005-2023 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { Chat } from "util/Chat"; +import { RPEvent } from "./RPEvent"; +import { stendhal } from "stendhal"; + +/** + * handles private text messages + */ +export class PrivateTextEvent extends RPEvent { + + public texttype!: string; + public text!: string; + public profile!: string; + + private soundTextEvents = ["privmsg", "support", "tutorial"]; + + public execute(_entity: any): void { + const ttype = this["texttype"].toLowerCase(); + const msg = this["text"].replace(/\\r\\n/g, "\n").replace(/\\r/g, "\n"); + + let profile; + if (this.hasOwnProperty("profile")) { + profile = this["profile"]; + } else if (ttype === "tutorial") { + profile = "floattingladynpc"; + } + + if (ttype === "server" && msg.includes("\n")) { + Chat.log(ttype, msg.split("\n"), undefined, profile); + } else { + // scene settings messages should not disturb playing, just create some atmosphere + const headed = ttype !== "scene_setting"; + Chat.log(ttype, msg, undefined, profile, headed); + } + + // play notification sound + const notif = stendhal.config.get("chat.private.sound"); + if (notif && this.soundTextEvents.indexOf(ttype) > -1) { + stendhal.sound.playGlobalizedEffect(notif); + } + } + +}; diff --git a/src/js/stendhal/event/ReachedAchievementEvent.ts b/src/js/stendhal/event/ReachedAchievementEvent.ts new file mode 100644 index 0000000000..be9505fee0 --- /dev/null +++ b/src/js/stendhal/event/ReachedAchievementEvent.ts @@ -0,0 +1,27 @@ +/*************************************************************************** + * (C) Copyright 2005-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { stendhal } from "stendhal"; +import { RPEvent } from "./RPEvent"; + +/** + * displays an achievement banner + */ +export class ReachedAchievementEvent extends RPEvent { + + public category!: string; + public title!: string; + public description!: string; + + public execute(_entity: any): void { + stendhal.ui.gamewindow.addAchievementNotif(this["category"], this["title"], this["description"]); + } +}; diff --git a/src/js/stendhal/event/TextEvent.ts b/src/js/stendhal/event/TextEvent.ts new file mode 100644 index 0000000000..4451a11a95 --- /dev/null +++ b/src/js/stendhal/event/TextEvent.ts @@ -0,0 +1,31 @@ +/*************************************************************************** + * (C) Copyright 2005-2023 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { Entity } from "entity/Entity"; +import { RPEvent } from "./RPEvent"; + +/** + * text events + */ +export class TextEvent extends RPEvent { + + public range!: string; + public text!: string; + + public execute(entity: Entity): void { + if (this["range"]) { + entity.say(this["text"], parseInt(this["range"], 10)); + } else { + entity.say(this["text"]); + } + } + +}; diff --git a/src/js/stendhal/event/TransitionGraphEvent.ts b/src/js/stendhal/event/TransitionGraphEvent.ts new file mode 100644 index 0000000000..0fd85559d8 --- /dev/null +++ b/src/js/stendhal/event/TransitionGraphEvent.ts @@ -0,0 +1,21 @@ +/*************************************************************************** + * (C) Copyright 2005-2023 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { RPEvent } from "./RPEvent"; + + +export class TransitionGraphEvent extends RPEvent { + + public execute(_entity: any): void { + // not implemented + } + +}; From 612b4a6b88eca82e5e872197458e8023e0504c36 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Wed, 14 Jan 2026 23:09:37 +0100 Subject: [PATCH 055/162] code cleanup --- src/js/stendhal/EventRegistry.ts | 87 ++++++++++++-------------------- 1 file changed, 32 insertions(+), 55 deletions(-) diff --git a/src/js/stendhal/EventRegistry.ts b/src/js/stendhal/EventRegistry.ts index 9f953a4059..56ec462a04 100644 --- a/src/js/stendhal/EventRegistry.ts +++ b/src/js/stendhal/EventRegistry.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2024 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -10,33 +10,27 @@ ***************************************************************************/ var marauroa = (window as any).marauroa = (window as any).marauroa || {}; -import { stendhal } from "./stendhal"; - -import { RPEntity } from "./entity/RPEntity"; -import { RPObject } from "./entity/RPObject"; +import { AttackEvent } from "event/AttackEvent"; import { BestiaryEvent } from "./event/BestiaryEvent"; import { ChatOptionsEvent } from "./event/ChatOptionsEvent"; import { ExamineEvent } from "./event/ExamineEvent"; +import { GlobalVisualEffectEvent } from "event/GlobalVisualEffectEvent"; import { GroupChangeEvent } from "./event/GroupChangeEvent"; import { GroupInviteEvent } from "./event/GroupInviteEvent"; +import { ImageEvent } from "event/ImageEvent"; import { PlayerLoggedOnEvent } from "./event/PlayerLoggedOnEvent"; import { PlayerLoggedOutEvent } from "./event/PlayerLoggedOutEvent"; +import { PrivateTextEvent } from "event/PrivateTextEvent"; import { ProgressStatusEvent } from "./event/ProgressStatusEvent"; -import { RPEvent } from "./event/RPEvent"; +import { ReachedAchievementEvent } from "event/ReachedAchievementEvent"; import { ShowItemListEvent } from "./event/ShowItemListEvent"; import { ShowOutfitListEvent } from "./event/ShowOutfitListEvent"; import { SoundEvent } from "./event/SoundEvent"; -import { TradeEvent } from "./event/TradeEvent"; -import { ViewChangeEvent } from "./event/ViewChangeEvent"; -import { Chat } from "./util/Chat"; -import { AttackEvent } from "event/AttackEvent"; -import { GlobalVisualEffectEvent } from "event/GlobalVisualEffectEvent"; -import { ImageEvent } from "event/ImageEvent"; -import { ReachedAchievementEvent } from "event/ReachedAchievementEvent"; import { TextEvent } from "event/TextEvent"; +import { TradeEvent } from "./event/TradeEvent"; import { TransitionGraphEvent } from "event/TransitionGraphEvent"; -import { PrivateTextEvent } from "event/PrivateTextEvent"; +import { ViewChangeEvent } from "./event/ViewChangeEvent"; export class EventRegistry { @@ -74,54 +68,37 @@ export class EventRegistry { } this.initialized = true; - this.register("chat_options", new ChatOptionsEvent()); - this.register("examine", new ExamineEvent()); - this.register("group_change_event", new GroupChangeEvent()); - this.register("group_invite_event", new GroupInviteEvent()); - this.register("progress_status_event", new ProgressStatusEvent()); - this.register("trade_state_change_event", new TradeEvent()); - - this.register("attack", new AttackEvent()); - - this.register("bestiary", new BestiaryEvent()); - - this.register("global_visual_effect", new GlobalVisualEffectEvent()); - - this.register("image_event", new ImageEvent()); - - this.register("player_logged_on", new PlayerLoggedOnEvent()); - this.register("player_logged_out", new PlayerLoggedOutEvent()); - - this.register("private_text", new PrivateTextEvent()); - - this.register("reached_achievement", new ReachedAchievementEvent()); - - this.register("show_item_list", new ShowItemListEvent()); - this.register("show_outfit_list", new ShowOutfitListEvent()); - - this.register("sound_event", new SoundEvent()); - - this.register("text", new TextEvent()); - - this.register("transition_graph", new TransitionGraphEvent()); - - this.register("view_change", new ViewChangeEvent()); + this.register("attack", AttackEvent); + this.register("bestiary", BestiaryEvent); + this.register("chat_options", ChatOptionsEvent); + this.register("examine", ExamineEvent); + this.register("global_visual_effect", GlobalVisualEffectEvent); + this.register("group_change_event", GroupChangeEvent); + this.register("group_invite_event", GroupInviteEvent); + this.register("image_event", ImageEvent); + this.register("player_logged_on", PlayerLoggedOnEvent); + this.register("player_logged_out", PlayerLoggedOutEvent); + this.register("private_text", PrivateTextEvent); + this.register("progress_status_event", ProgressStatusEvent); + this.register("reached_achievement", ReachedAchievementEvent); + this.register("show_item_list", ShowItemListEvent); + this.register("show_outfit_list", ShowOutfitListEvent); + this.register("sound_event", SoundEvent); + this.register("text", TextEvent); + this.register("trade_state_change_event", TradeEvent); + this.register("transition_graph", TransitionGraphEvent); + this.register("view_change", ViewChangeEvent); } /** * Registers a new event. * - * @param _type + * @param type * String identifier. - * @param _event + * @param event * Event to be registered. */ - register(_type: string, _event: any) { - if (_event instanceof RPEvent) { - marauroa.rpeventFactory[_type] = _event; - } else { - marauroa.rpeventFactory[_type] = - marauroa.util.fromProto(marauroa.rpeventFactory["_default"], _event); - } + register(type: string, event: any) { + marauroa.rpeventFactory[type] = event; } } From d6ca574a2046233111f0282ef5310a0b9ad39099 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Thu, 15 Jan 2026 21:42:09 +0100 Subject: [PATCH 056/162] fixed references to wrong "ui" variable --- src/js/stendhal/action/AboutAction.ts | 2 +- src/js/stendhal/action/SettingsAction.ts | 2 +- src/js/stendhal/ui/toolkit/FloatingWindow.ts | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/js/stendhal/action/AboutAction.ts b/src/js/stendhal/action/AboutAction.ts index 5ab56f90f0..e5ba9ee862 100644 --- a/src/js/stendhal/action/AboutAction.ts +++ b/src/js/stendhal/action/AboutAction.ts @@ -28,7 +28,7 @@ export class AboutAction extends SlashAction { execute(_type: string, _params: string[], _remainder: string): boolean { const wstate = stendhal.config.getWindowState("about"); - const offset = stendhal.ui.getPageOffset(); + const offset = ui.getPageOffset(); const content = new AboutDialog(); const dialog = ui.createSingletonFloatingWindow( diff --git a/src/js/stendhal/action/SettingsAction.ts b/src/js/stendhal/action/SettingsAction.ts index 9396e8e7d3..61e00d60d0 100644 --- a/src/js/stendhal/action/SettingsAction.ts +++ b/src/js/stendhal/action/SettingsAction.ts @@ -28,7 +28,7 @@ export class SettingsAction extends SlashAction { execute(_type: string, _params: string[], _remainder: string): boolean { const wstate = stendhal.config.getWindowState("menu"); - const offset = stendhal.ui.getPageOffset(); + const offset = ui.getPageOffset(); const content = new SettingsDialog(); const dialog = ui.createSingletonFloatingWindow( diff --git a/src/js/stendhal/ui/toolkit/FloatingWindow.ts b/src/js/stendhal/ui/toolkit/FloatingWindow.ts index 353c664ed0..750ea24b36 100644 --- a/src/js/stendhal/ui/toolkit/FloatingWindow.ts +++ b/src/js/stendhal/ui/toolkit/FloatingWindow.ts @@ -10,9 +10,8 @@ ***************************************************************************/ import { stendhal } from "../../stendhal"; - import { Component } from "./Component"; - +import { ui } from "../UI"; import { Point } from "../../util/Point"; @@ -181,7 +180,7 @@ export class FloatingWindow extends Component { clientAreaHeight = window.visualViewport?.height || 200; } - const offset = stendhal.ui.getPageOffset(); + const offset = ui.getPageOffset(); let newX = dialogArea.x; let newY = dialogArea.y; From 1f3abca39cbadfd69e25899df32725b8f41106ae Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 16 Jan 2026 22:03:57 +0100 Subject: [PATCH 057/162] use register for events --- src/js/stendhal/EventRegistry.ts | 51 +++++++++++++------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/src/js/stendhal/EventRegistry.ts b/src/js/stendhal/EventRegistry.ts index 56ec462a04..434dace5a9 100644 --- a/src/js/stendhal/EventRegistry.ts +++ b/src/js/stendhal/EventRegistry.ts @@ -68,37 +68,26 @@ export class EventRegistry { } this.initialized = true; - this.register("attack", AttackEvent); - this.register("bestiary", BestiaryEvent); - this.register("chat_options", ChatOptionsEvent); - this.register("examine", ExamineEvent); - this.register("global_visual_effect", GlobalVisualEffectEvent); - this.register("group_change_event", GroupChangeEvent); - this.register("group_invite_event", GroupInviteEvent); - this.register("image_event", ImageEvent); - this.register("player_logged_on", PlayerLoggedOnEvent); - this.register("player_logged_out", PlayerLoggedOutEvent); - this.register("private_text", PrivateTextEvent); - this.register("progress_status_event", ProgressStatusEvent); - this.register("reached_achievement", ReachedAchievementEvent); - this.register("show_item_list", ShowItemListEvent); - this.register("show_outfit_list", ShowOutfitListEvent); - this.register("sound_event", SoundEvent); - this.register("text", TextEvent); - this.register("trade_state_change_event", TradeEvent); - this.register("transition_graph", TransitionGraphEvent); - this.register("view_change", ViewChangeEvent); + marauroa.rpeventFactory.register("attack", AttackEvent); + marauroa.rpeventFactory.register("bestiary", BestiaryEvent); + marauroa.rpeventFactory.register("chat_options", ChatOptionsEvent); + marauroa.rpeventFactory.register("examine", ExamineEvent); + marauroa.rpeventFactory.register("global_visual_effect", GlobalVisualEffectEvent); + marauroa.rpeventFactory.register("group_change_event", GroupChangeEvent); + marauroa.rpeventFactory.register("group_invite_event", GroupInviteEvent); + marauroa.rpeventFactory.register("image_event", ImageEvent); + marauroa.rpeventFactory.register("player_logged_on", PlayerLoggedOnEvent); + marauroa.rpeventFactory.register("player_logged_out", PlayerLoggedOutEvent); + marauroa.rpeventFactory.register("private_text", PrivateTextEvent); + marauroa.rpeventFactory.register("progress_status_event", ProgressStatusEvent); + marauroa.rpeventFactory.register("reached_achievement", ReachedAchievementEvent); + marauroa.rpeventFactory.register("show_item_list", ShowItemListEvent); + marauroa.rpeventFactory.register("show_outfit_list", ShowOutfitListEvent); + marauroa.rpeventFactory.register("sound_event", SoundEvent); + marauroa.rpeventFactory.register("text", TextEvent); + marauroa.rpeventFactory.register("trade_state_change_event", TradeEvent); + marauroa.rpeventFactory.register("transition_graph", TransitionGraphEvent); + marauroa.rpeventFactory.register("view_change", ViewChangeEvent); } - /** - * Registers a new event. - * - * @param type - * String identifier. - * @param event - * Event to be registered. - */ - register(type: string, event: any) { - marauroa.rpeventFactory[type] = event; - } } From 3424b898b8824c8ca0c2037e3f1d071382ec0845 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 16 Jan 2026 22:04:13 +0100 Subject: [PATCH 058/162] created dedicated CorpseSlot class --- src/js/stendhal/entity/Corpse.ts | 20 ++------- src/js/stendhal/entity/CorpseSlot.ts | 34 ++++++++++++++ src/js/stendhal/entity/RPSlot.ts | 66 ++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 16 deletions(-) create mode 100644 src/js/stendhal/entity/CorpseSlot.ts create mode 100644 src/js/stendhal/entity/RPSlot.ts diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index 398f370449..7c4880c8cc 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { CorpseSlot } from "./CorpseSlot"; import { RenderingContext2D } from "util/Types"; import { ActivityIndicatorSprite } from "../sprite/ActivityIndicatorSprite"; @@ -20,6 +21,7 @@ import { Chat } from "../util/Chat"; import { PopupInventory } from "./PopupInventory"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; +import { MarauroaUtils } from "marauroa/MarauroaUtils"; var marauroa = (window as any).marauroa = (window as any).marauroa || {}; import { stendhal } from "../stendhal"; @@ -38,6 +40,7 @@ export class Corpse extends PopupInventory { if (stendhal.config.getBoolean("activity-indicator")) { this.indicator = new ActivityIndicatorSprite(); } + console.log('XXXX', MarauroaUtils.isEmpty({}), MarauroaUtils.isEmpty({'a': 'b'})); } override set(key: string, value: any) { @@ -81,23 +84,8 @@ export class Corpse extends PopupInventory { } override createSlot(name: string) { - var slot = marauroa.util.fromProto(marauroa.rpslotFactory["_default"], { - add: function(object: any) { - marauroa.rpslotFactory["_default"].add.apply(this, arguments); - if (this._objects.length > 0) { - this._parent.autoOpenIfDesired(); - } - }, - - del: function(key: any) { - marauroa.rpslotFactory["_default"].del.apply(this, arguments); - if (this._objects.length == 0) { - this._parent.closeCorpseInventory(); - } - } - }); + let slot = new CorpseSlot(); slot._name = name; - slot._objects = []; slot._parent = this; return slot; } diff --git a/src/js/stendhal/entity/CorpseSlot.ts b/src/js/stendhal/entity/CorpseSlot.ts new file mode 100644 index 0000000000..67e856a36f --- /dev/null +++ b/src/js/stendhal/entity/CorpseSlot.ts @@ -0,0 +1,34 @@ +/*************************************************************************** + * (C) Copyright 2003-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { Corpse } from "./Corpse"; +import { RPSlot } from "./RPSlot"; + +export class CorpseSlot extends RPSlot { + + public _name?: string; + public _parent?: Corpse; + + override add(object: any) { + super.add(object); + if (this._objects.length > 0) { + this._parent?.autoOpenIfDesired(); + } + } + + override del(key: any) { + super.del(key); + if (this._objects.length == 0) { + this._parent?.closeCorpseInventory(); + } + } + +} diff --git a/src/js/stendhal/entity/RPSlot.ts b/src/js/stendhal/entity/RPSlot.ts new file mode 100644 index 0000000000..a4785a0a5d --- /dev/null +++ b/src/js/stendhal/entity/RPSlot.ts @@ -0,0 +1,66 @@ +/*************************************************************************** + * (C) Copyright 2003-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +/** + * base class for RPSlots + */ +export class RPSlot { + [key: string]: any; + protected _objects: Record[] = []; + + add(value: any) { + if (value && value["id"]) { + this._objects.push(value); + } + } + + get(key: string|number) { + let idx = this.getIndex(key); + if (idx > -1) { + return this._objects[idx]; + } + return undefined; + } + + getByIndex(idx: number) { + return this._objects[idx]; + } + + count() { + return this._objects.length; + } + + getIndex(key: string|number): number { + let i; + let c = this._objects.length; + for (i = 0; i < c; i++) { + if (this._objects[i]["id"] === key) { + return i; + } + } + return -1; + } + + del(key: string|number) { + let idx = this.getIndex(key); + if (idx > -1) { + this._objects.splice(idx, 1); + } + } + + first() { + if (this._objects.length > 0) { + return this._objects[0]; + } + return undefined; + } + +} From b71a29f88326a9099c02f3e9e64d98b367b9ac5d Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 16 Jan 2026 22:04:56 +0100 Subject: [PATCH 059/162] user register for RPObjects --- src/js/stendhal/entity/EntityRegistry.ts | 76 ++++++++++++------------ src/js/stendhal/entity/NPC.ts | 2 - 2 files changed, 38 insertions(+), 40 deletions(-) diff --git a/src/js/stendhal/entity/EntityRegistry.ts b/src/js/stendhal/entity/EntityRegistry.ts index 92971c3239..5978235a46 100644 --- a/src/js/stendhal/entity/EntityRegistry.ts +++ b/src/js/stendhal/entity/EntityRegistry.ts @@ -38,43 +38,43 @@ import { WalkBlocker } from "./WalkBlocker"; export class EntityRegistry { public init() { - marauroa.rpobjectFactory["area"] = InvisibleEntity; - marauroa.rpobjectFactory["baby_dragon"] = DomesticAnimal; - marauroa.rpobjectFactory["blackboard"] = Sign; - marauroa.rpobjectFactory["blocktarget"] = InvisibleEntity; - marauroa.rpobjectFactory["block"] = VisibleEntity; - marauroa.rpobjectFactory["blood"] = Blood; - marauroa.rpobjectFactory["cat"] = DomesticAnimal; - marauroa.rpobjectFactory["chest"] = Chest; - marauroa.rpobjectFactory["corpse"] = Corpse; - marauroa.rpobjectFactory["creature"] = Creature; - marauroa.rpobjectFactory["_default"] = UnknownEntity; - marauroa.rpobjectFactory["domesticanimal"] = DomesticAnimal; - marauroa.rpobjectFactory["door"] = Door; - marauroa.rpobjectFactory["flyover"] = InvisibleEntity; - marauroa.rpobjectFactory["food"] = Food; - marauroa.rpobjectFactory["game_board"] = GameBoard; - marauroa.rpobjectFactory["gate"] = Gate - marauroa.rpobjectFactory["growing_entity_spawner"] = GrowingEntitySpawner; - marauroa.rpobjectFactory["house_portal"] = Portal; - marauroa.rpobjectFactory["invisible_entity"] = InvisibleEntity; - marauroa.rpobjectFactory["item"] = Item; - marauroa.rpobjectFactory["looped_sound_source"] = LoopedSoundSource; - marauroa.rpobjectFactory["npc"] = NPC; - marauroa.rpobjectFactory["plant_grower"] = VisibleEntity; - marauroa.rpobjectFactory["player"] = Player; - marauroa.rpobjectFactory["portal"] = Portal; - marauroa.rpobjectFactory["rented_sign"] = Sign; - marauroa.rpobjectFactory["sheep"] = DomesticAnimal; - marauroa.rpobjectFactory["sign"] = Sign; - marauroa.rpobjectFactory["tiled_entity"] = InvisibleEntity; - marauroa.rpobjectFactory["training_dummy"] = TrainingDummy; - marauroa.rpobjectFactory["unknown"] = UnknownEntity; - marauroa.rpobjectFactory["useable_entity"] = UseableEntity; - marauroa.rpobjectFactory["user"] = User; - marauroa.rpobjectFactory["visible_entity"] = VisibleEntity; - marauroa.rpobjectFactory["walkblocker"] = WalkBlocker; - marauroa.rpobjectFactory["wall"] = InvisibleEntity; - marauroa.rpobjectFactory["weather_entity"] = InvisibleEntity; + marauroa.rpobjectFactory.register("area", InvisibleEntity); + marauroa.rpobjectFactory.register("baby_dragon", DomesticAnimal); + marauroa.rpobjectFactory.register("blackboard", Sign); + marauroa.rpobjectFactory.register("blocktarget", InvisibleEntity); + marauroa.rpobjectFactory.register("block", VisibleEntity); + marauroa.rpobjectFactory.register("blood", Blood); + marauroa.rpobjectFactory.register("cat", DomesticAnimal); + marauroa.rpobjectFactory.register("chest", Chest); + marauroa.rpobjectFactory.register("corpse", Corpse); + marauroa.rpobjectFactory.register("creature", Creature); + marauroa.rpobjectFactory.register("_default", UnknownEntity); + marauroa.rpobjectFactory.register("domesticanimal", DomesticAnimal); + marauroa.rpobjectFactory.register("door", Door); + marauroa.rpobjectFactory.register("flyover", InvisibleEntity); + marauroa.rpobjectFactory.register("food", Food); + marauroa.rpobjectFactory.register("game_board", GameBoard); + marauroa.rpobjectFactory.register("gate", Gate); + marauroa.rpobjectFactory.register("growing_entity_spawner", GrowingEntitySpawner); + marauroa.rpobjectFactory.register("house_portal", Portal); + marauroa.rpobjectFactory.register("invisible_entity", InvisibleEntity); + marauroa.rpobjectFactory.register("item", Item); + marauroa.rpobjectFactory.register("looped_sound_source", LoopedSoundSource); + marauroa.rpobjectFactory.register("npc", NPC); + marauroa.rpobjectFactory.register("plant_grower", VisibleEntity); + marauroa.rpobjectFactory.register("player", Player); + marauroa.rpobjectFactory.register("portal", Portal); + marauroa.rpobjectFactory.register("rented_sign", Sign); + marauroa.rpobjectFactory.register("sheep", DomesticAnimal); + marauroa.rpobjectFactory.register("sign", Sign); + marauroa.rpobjectFactory.register("tiled_entity", InvisibleEntity); + marauroa.rpobjectFactory.register("training_dummy", TrainingDummy); + marauroa.rpobjectFactory.register("unknown", UnknownEntity); + marauroa.rpobjectFactory.register("useable_entity", UseableEntity); + marauroa.rpobjectFactory.register("user", User); + marauroa.rpobjectFactory.register("visible_entity", VisibleEntity); + marauroa.rpobjectFactory.register("walkblocker", WalkBlocker); + marauroa.rpobjectFactory.register("wall", InvisibleEntity); + marauroa.rpobjectFactory.register("weather_entity", InvisibleEntity); } } diff --git a/src/js/stendhal/entity/NPC.ts b/src/js/stendhal/entity/NPC.ts index f9e079977a..1f4f17e660 100644 --- a/src/js/stendhal/entity/NPC.ts +++ b/src/js/stendhal/entity/NPC.ts @@ -17,8 +17,6 @@ import { Color } from "../data/color/Color"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; -import { stendhal } from "../stendhal"; - export class NPC extends RPEntity { override minimapStyle = Color.NPC; override spritePath = "npc"; From f4935f4928ef47a50c91605d887e52a8de14f601 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 16 Jan 2026 22:07:55 +0100 Subject: [PATCH 060/162] updated marauroa.jar --- libs/marauroa.jar | Bin 477245 -> 485790 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/marauroa.jar b/libs/marauroa.jar index 85450462881a7bac13b753b0bcdf37eac5a9225f..174b2cbe81f3a02265ea2988f213ed89d9d6b924 100644 GIT binary patch delta 26844 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 delta 18537 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 Z(Y}oeJ{v?r5=9n8w(>wi>YliU{|7+M47mUR From d633ebf947f881d33e4718962068299671713d35 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 17 Jan 2026 15:15:33 +0100 Subject: [PATCH 061/162] use instance of Marauroa class instead of global marauroa object --- src/js/stendhal/Client.ts | 4 ++-- src/js/stendhal/EventRegistry.ts | 2 +- src/js/stendhal/SlashActionRepo.ts | 2 +- src/js/stendhal/action/DebugAction.ts | 2 +- src/js/stendhal/action/SlashAction.ts | 2 +- src/js/stendhal/data/CStatus.ts | 2 +- src/js/stendhal/data/TileMap.ts | 6 +++--- src/js/stendhal/data/sound/LoopedSoundSourceManager.ts | 4 ++-- src/js/stendhal/data/sound/SoundManager.ts | 2 +- src/js/stendhal/entity/Chest.ts | 2 +- src/js/stendhal/entity/Corpse.ts | 2 +- src/js/stendhal/entity/Creature.ts | 2 +- src/js/stendhal/entity/DomesticAnimal.ts | 2 +- src/js/stendhal/entity/Entity.ts | 2 +- src/js/stendhal/entity/EntityRegistry.ts | 2 +- src/js/stendhal/entity/Food.ts | 2 +- src/js/stendhal/entity/Gate.ts | 2 +- src/js/stendhal/entity/Ground.ts | 2 +- src/js/stendhal/entity/GrowingEntitySpawner.ts | 2 +- src/js/stendhal/entity/Item.ts | 2 +- src/js/stendhal/entity/ItemMap.ts | 2 +- src/js/stendhal/entity/Player.ts | 2 +- src/js/stendhal/entity/PopupInventory.ts | 2 +- src/js/stendhal/entity/Portal.ts | 2 +- src/js/stendhal/entity/RPEntity.ts | 2 +- src/js/stendhal/entity/RPObject.ts | 2 +- src/js/stendhal/entity/TrainingDummy.ts | 2 +- src/js/stendhal/entity/UnknownEntity.ts | 2 +- src/js/stendhal/entity/User.ts | 2 +- src/js/stendhal/entity/Zone.ts | 2 +- src/js/stendhal/event/ChatOptionsEvent.ts | 2 +- src/js/stendhal/event/ExamineEvent.ts | 2 +- src/js/stendhal/event/GroupChangeEvent.ts | 2 +- src/js/stendhal/event/GroupInviteEvent.ts | 2 +- src/js/stendhal/event/SoundEvent.ts | 2 +- src/js/stendhal/event/TradeEvent.ts | 2 +- src/js/stendhal/main.ts | 3 --- src/js/stendhal/ui/UI.ts | 2 +- src/js/stendhal/ui/ViewPort.ts | 2 +- src/js/stendhal/ui/component/BagComponent.ts | 2 +- src/js/stendhal/ui/component/BuddyListComponent.ts | 2 +- src/js/stendhal/ui/component/ChatInputComponent.ts | 2 +- src/js/stendhal/ui/component/GroupMemberComponent.ts | 2 +- src/js/stendhal/ui/component/GroupPanelComponent.ts | 2 +- src/js/stendhal/ui/component/ItemContainerImplementation.ts | 2 +- src/js/stendhal/ui/component/KeyringComponent.ts | 2 +- src/js/stendhal/ui/component/MiniMapComponent.ts | 2 +- src/js/stendhal/ui/component/PlayerEquipmentComponent.ts | 2 +- src/js/stendhal/ui/component/PlayerStatsComponent.ts | 2 +- src/js/stendhal/ui/component/ZoneInfoComponent.ts | 2 +- src/js/stendhal/ui/dialog/ActionContextMenu.ts | 2 +- src/js/stendhal/ui/dialog/ChatOptionsDialog.ts | 2 +- src/js/stendhal/ui/dialog/CreateAccountDialog.ts | 2 +- src/js/stendhal/ui/dialog/DropQuantitySelectorDialog.ts | 2 +- src/js/stendhal/ui/dialog/EmojiMapDialog.ts | 2 +- src/js/stendhal/ui/dialog/ImageViewerDialog.ts | 2 +- src/js/stendhal/ui/dialog/LoginDialog.ts | 2 +- src/js/stendhal/ui/dialog/TradeDialog.ts | 2 +- src/js/stendhal/ui/dialog/TravelLogDialog.ts | 2 +- src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts | 2 +- src/js/stendhal/ui/dialog/settings/GeneralTab.ts | 2 +- src/js/stendhal/ui/joystick/JoystickImpl.ts | 2 +- src/js/stendhal/util/Chat.ts | 2 +- src/js/stendhal/util/ChatCompletionHelper.ts | 2 +- src/js/stendhal/util/FacingHandler.ts | 2 +- src/js/stendhal/util/JSONLoader.ts | 2 +- src/js/stendhal/util/KeyHandler.ts | 2 +- 67 files changed, 70 insertions(+), 73 deletions(-) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index 3d13c8d3ba..56bfd52cc0 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa, Deserializer } from "marauroa" import { stendhal } from "./stendhal"; import { PerceptionListener } from "./PerceptionListener"; @@ -474,7 +474,7 @@ export class Client { */ onDataMap(data: any) { var zoneinfo = {} as {[key: string]: string}; - var deserializer = marauroa.Deserializer.fromBase64(data); + var deserializer = Deserializer.fromBase64(data); deserializer.readAttributes(zoneinfo); (ui.get(UIComponentEnum.ZoneInfo) as ZoneInfoComponent).zoneChange(zoneinfo); diff --git a/src/js/stendhal/EventRegistry.ts b/src/js/stendhal/EventRegistry.ts index 434dace5a9..e58b5ac86b 100644 --- a/src/js/stendhal/EventRegistry.ts +++ b/src/js/stendhal/EventRegistry.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { AttackEvent } from "event/AttackEvent"; import { BestiaryEvent } from "./event/BestiaryEvent"; diff --git a/src/js/stendhal/SlashActionRepo.ts b/src/js/stendhal/SlashActionRepo.ts index b12090863e..6b809fb320 100644 --- a/src/js/stendhal/SlashActionRepo.ts +++ b/src/js/stendhal/SlashActionRepo.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "./stendhal"; import { singletons } from "./SingletonRepo"; diff --git a/src/js/stendhal/action/DebugAction.ts b/src/js/stendhal/action/DebugAction.ts index 7074fe446d..37b3c8a437 100644 --- a/src/js/stendhal/action/DebugAction.ts +++ b/src/js/stendhal/action/DebugAction.ts @@ -23,7 +23,7 @@ import { Chat } from "../util/Chat"; import { Debug } from "../util/Debug"; import { Paths } from "../data/Paths"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; /** diff --git a/src/js/stendhal/action/SlashAction.ts b/src/js/stendhal/action/SlashAction.ts index 5c304f9987..0e0632a3d1 100644 --- a/src/js/stendhal/action/SlashAction.ts +++ b/src/js/stendhal/action/SlashAction.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { ParamList } from "./ParamList"; import { Pair } from "../util/Pair"; diff --git a/src/js/stendhal/data/CStatus.ts b/src/js/stendhal/data/CStatus.ts index a0d62cf33b..a0e77f6992 100644 --- a/src/js/stendhal/data/CStatus.ts +++ b/src/js/stendhal/data/CStatus.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/data/TileMap.ts b/src/js/stendhal/data/TileMap.ts index 76f9cfbc3d..30102ee7b9 100644 --- a/src/js/stendhal/data/TileMap.ts +++ b/src/js/stendhal/data/TileMap.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { Deserializer } from "marauroa" import { stendhal } from "../stendhal"; import { Paths } from "./Paths"; @@ -141,7 +141,7 @@ export class TileMap { decodeTileset(content: any, name: string) { var layerData = content[name]; - var deserializer = marauroa.Deserializer.fromBase64(layerData); + var deserializer = Deserializer.fromBase64(layerData); var amount = deserializer.readInt() as number; this.tilesetFilenames = []; @@ -195,7 +195,7 @@ export class TileMap { if (!layerData) { return; } - var deserializer = marauroa.Deserializer.fromDeflatedBase64(layerData); + var deserializer = Deserializer.fromDeflatedBase64(layerData); deserializer.readString(); // zone name this.zoneSizeX = deserializer.readInt(); this.zoneSizeY = deserializer.readInt(); diff --git a/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts b/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts index 5d2bbeb741..92c7a96858 100644 --- a/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts +++ b/src/js/stendhal/data/sound/LoopedSoundSourceManager.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright © 2003-2024 - Faiumoni e. V. * + * Copyright © 2003-2026 - Faiumoni e. V. * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; import { LoopedSoundSource } from "../../entity/LoopedSoundSource"; diff --git a/src/js/stendhal/data/sound/SoundManager.ts b/src/js/stendhal/data/sound/SoundManager.ts index 87b89f9ba7..100899de53 100644 --- a/src/js/stendhal/data/sound/SoundManager.ts +++ b/src/js/stendhal/data/sound/SoundManager.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; import { SoundFactory } from "./SoundFactory"; diff --git a/src/js/stendhal/entity/Chest.ts b/src/js/stendhal/entity/Chest.ts index e55203e308..618adbe5b0 100644 --- a/src/js/stendhal/entity/Chest.ts +++ b/src/js/stendhal/entity/Chest.ts @@ -21,7 +21,7 @@ import { ItemInventoryComponent } from "../ui/component/ItemInventoryComponent"; import { Chat } from "../util/Chat"; import { Paths } from "../data/Paths"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index 7c4880c8cc..72d7b76b4a 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -23,7 +23,7 @@ import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; import { MarauroaUtils } from "marauroa/MarauroaUtils"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; export class Corpse extends PopupInventory { diff --git a/src/js/stendhal/entity/Creature.ts b/src/js/stendhal/entity/Creature.ts index 0ea549f221..4cfb8b784e 100644 --- a/src/js/stendhal/entity/Creature.ts +++ b/src/js/stendhal/entity/Creature.ts @@ -18,7 +18,7 @@ import { Color } from "../data/color/Color"; import { SkillEffect } from "../sprite/action/SkillEffect"; import { Paths } from "../data/Paths"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; export class Creature extends RPEntity { diff --git a/src/js/stendhal/entity/DomesticAnimal.ts b/src/js/stendhal/entity/DomesticAnimal.ts index 0d11b013f6..53bcc49546 100644 --- a/src/js/stendhal/entity/DomesticAnimal.ts +++ b/src/js/stendhal/entity/DomesticAnimal.ts @@ -17,7 +17,7 @@ import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" export class DomesticAnimal extends RPEntity { diff --git a/src/js/stendhal/entity/Entity.ts b/src/js/stendhal/entity/Entity.ts index 2b09e83333..d820972b03 100644 --- a/src/js/stendhal/entity/Entity.ts +++ b/src/js/stendhal/entity/Entity.ts @@ -16,7 +16,7 @@ import { RPObject } from "./RPObject"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; /** diff --git a/src/js/stendhal/entity/EntityRegistry.ts b/src/js/stendhal/entity/EntityRegistry.ts index 5978235a46..aef519c5bd 100644 --- a/src/js/stendhal/entity/EntityRegistry.ts +++ b/src/js/stendhal/entity/EntityRegistry.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { Blood } from "./Blood"; import { Chest} from "./Chest"; diff --git a/src/js/stendhal/entity/Food.ts b/src/js/stendhal/entity/Food.ts index 0025f18dbf..c1f1ab0fdb 100644 --- a/src/js/stendhal/entity/Food.ts +++ b/src/js/stendhal/entity/Food.ts @@ -14,7 +14,7 @@ import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" export class Food extends Entity { diff --git a/src/js/stendhal/entity/Gate.ts b/src/js/stendhal/entity/Gate.ts index 3c67c3409f..e112ec413e 100644 --- a/src/js/stendhal/entity/Gate.ts +++ b/src/js/stendhal/entity/Gate.ts @@ -15,7 +15,7 @@ import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" export class Gate extends Entity { diff --git a/src/js/stendhal/entity/Ground.ts b/src/js/stendhal/entity/Ground.ts index 153101ecbb..3a90bae845 100644 --- a/src/js/stendhal/entity/Ground.ts +++ b/src/js/stendhal/entity/Ground.ts @@ -11,7 +11,7 @@ import { Paths } from "../data/Paths"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/entity/GrowingEntitySpawner.ts b/src/js/stendhal/entity/GrowingEntitySpawner.ts index cb0c2c9d89..2bc598925a 100644 --- a/src/js/stendhal/entity/GrowingEntitySpawner.ts +++ b/src/js/stendhal/entity/GrowingEntitySpawner.ts @@ -15,7 +15,7 @@ import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" export class GrowingEntitySpawner extends Entity { diff --git a/src/js/stendhal/entity/Item.ts b/src/js/stendhal/entity/Item.ts index c8a0a6fa1c..d56c7e7f0a 100644 --- a/src/js/stendhal/entity/Item.ts +++ b/src/js/stendhal/entity/Item.ts @@ -17,7 +17,7 @@ import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" export class Item extends Entity { diff --git a/src/js/stendhal/entity/ItemMap.ts b/src/js/stendhal/entity/ItemMap.ts index 016adb8a9d..b352055586 100644 --- a/src/js/stendhal/entity/ItemMap.ts +++ b/src/js/stendhal/entity/ItemMap.ts @@ -15,7 +15,7 @@ import { MenuItem } from "../action/MenuItem"; const config = singletons.getConfigManager(); -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" const defaultUse = { title: "Use", diff --git a/src/js/stendhal/entity/Player.ts b/src/js/stendhal/entity/Player.ts index 694631716e..80df9f55f9 100644 --- a/src/js/stendhal/entity/Player.ts +++ b/src/js/stendhal/entity/Player.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; import { RPEntity } from "./RPEntity"; diff --git a/src/js/stendhal/entity/PopupInventory.ts b/src/js/stendhal/entity/PopupInventory.ts index 2f1e19a6ed..eead129ecd 100644 --- a/src/js/stendhal/entity/PopupInventory.ts +++ b/src/js/stendhal/entity/PopupInventory.ts @@ -13,7 +13,7 @@ import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; import { RPObject } from "./RPObject"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" export class PopupInventory extends Entity { diff --git a/src/js/stendhal/entity/Portal.ts b/src/js/stendhal/entity/Portal.ts index 7d68550747..fa046171ad 100644 --- a/src/js/stendhal/entity/Portal.ts +++ b/src/js/stendhal/entity/Portal.ts @@ -15,7 +15,7 @@ import { MenuItem } from "../action/MenuItem"; import { Color } from "../data/color/Color"; import { Paths } from "../data/Paths"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; export class Portal extends Entity { diff --git a/src/js/stendhal/entity/RPEntity.ts b/src/js/stendhal/entity/RPEntity.ts index 9c5ace8f48..5fb8bf79fd 100644 --- a/src/js/stendhal/entity/RPEntity.ts +++ b/src/js/stendhal/entity/RPEntity.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; import { ActiveEntity } from "./ActiveEntity"; diff --git a/src/js/stendhal/entity/RPObject.ts b/src/js/stendhal/entity/RPObject.ts index 6e597bd0d3..a521506a92 100644 --- a/src/js/stendhal/entity/RPObject.ts +++ b/src/js/stendhal/entity/RPObject.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** diff --git a/src/js/stendhal/entity/TrainingDummy.ts b/src/js/stendhal/entity/TrainingDummy.ts index 2da3b82ba3..7d3ab13445 100644 --- a/src/js/stendhal/entity/TrainingDummy.ts +++ b/src/js/stendhal/entity/TrainingDummy.ts @@ -12,7 +12,7 @@ import { Paths } from "../data/Paths"; import { NPC } from "./NPC"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/entity/UnknownEntity.ts b/src/js/stendhal/entity/UnknownEntity.ts index ab71ecb2a9..1a9381ff08 100644 --- a/src/js/stendhal/entity/UnknownEntity.ts +++ b/src/js/stendhal/entity/UnknownEntity.ts @@ -11,7 +11,7 @@ import { Entity } from "./Entity"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" export class UnknownEntity extends Entity { diff --git a/src/js/stendhal/entity/User.ts b/src/js/stendhal/entity/User.ts index 0808be34e8..a07c0ccb5e 100644 --- a/src/js/stendhal/entity/User.ts +++ b/src/js/stendhal/entity/User.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; import { Entity } from "./Entity"; diff --git a/src/js/stendhal/entity/Zone.ts b/src/js/stendhal/entity/Zone.ts index a9f3357aba..fb0020fa35 100644 --- a/src/js/stendhal/entity/Zone.ts +++ b/src/js/stendhal/entity/Zone.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; import { Entity } from "./Entity"; diff --git a/src/js/stendhal/event/ChatOptionsEvent.ts b/src/js/stendhal/event/ChatOptionsEvent.ts index 46165e6de8..aa74128e0a 100644 --- a/src/js/stendhal/event/ChatOptionsEvent.ts +++ b/src/js/stendhal/event/ChatOptionsEvent.ts @@ -13,7 +13,7 @@ import { Chat } from "../util/Chat"; import { ChatOptionsDialog } from "../ui/dialog/ChatOptionsDialog"; import { RPEvent } from "./RPEvent"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * shows an image for a detail view diff --git a/src/js/stendhal/event/ExamineEvent.ts b/src/js/stendhal/event/ExamineEvent.ts index e4abba9bf5..4414760dd8 100644 --- a/src/js/stendhal/event/ExamineEvent.ts +++ b/src/js/stendhal/event/ExamineEvent.ts @@ -13,7 +13,7 @@ import { ImageViewerDialog } from "../ui/dialog/ImageViewerDialog"; import { ui } from "../ui/UI"; import { RPEvent } from "./RPEvent"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * shows an image for a detail view diff --git a/src/js/stendhal/event/GroupChangeEvent.ts b/src/js/stendhal/event/GroupChangeEvent.ts index e99f53a66b..f9d492506e 100644 --- a/src/js/stendhal/event/GroupChangeEvent.ts +++ b/src/js/stendhal/event/GroupChangeEvent.ts @@ -15,7 +15,7 @@ import { UIComponentEnum } from "../ui/UIComponentEnum"; import { GroupPanelComponent } from "../ui/component/GroupPanelComponent"; import { stendhal } from "../stendhal"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * handles player trade events diff --git a/src/js/stendhal/event/GroupInviteEvent.ts b/src/js/stendhal/event/GroupInviteEvent.ts index 3f84849985..31918a46f4 100644 --- a/src/js/stendhal/event/GroupInviteEvent.ts +++ b/src/js/stendhal/event/GroupInviteEvent.ts @@ -15,7 +15,7 @@ import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { GroupPanelComponent } from "../ui/component/GroupPanelComponent"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * handles player trade events diff --git a/src/js/stendhal/event/SoundEvent.ts b/src/js/stendhal/event/SoundEvent.ts index 812f258408..0160332efb 100644 --- a/src/js/stendhal/event/SoundEvent.ts +++ b/src/js/stendhal/event/SoundEvent.ts @@ -15,7 +15,7 @@ import { RPEvent } from "./RPEvent"; import { SoundID } from "../data/sound/SoundID"; import { SoundManager } from "../data/sound/SoundManager"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/event/TradeEvent.ts b/src/js/stendhal/event/TradeEvent.ts index 9652168503..1b5ee10f44 100644 --- a/src/js/stendhal/event/TradeEvent.ts +++ b/src/js/stendhal/event/TradeEvent.ts @@ -18,7 +18,7 @@ import { ui } from "../ui/UI"; import { RPEvent } from "./RPEvent"; import { stendhal } from "../stendhal"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * handles player trade events diff --git a/src/js/stendhal/main.ts b/src/js/stendhal/main.ts index f44169b767..f6e61506f5 100644 --- a/src/js/stendhal/main.ts +++ b/src/js/stendhal/main.ts @@ -9,9 +9,6 @@ * * ***************************************************************************/ -(window as any).marauroa = (window as any).marauroa || {}; - - import { stendhal } from "./stendhal"; import { Client } from "./Client"; diff --git a/src/js/stendhal/ui/UI.ts b/src/js/stendhal/ui/UI.ts index c56b912ac0..a0e77d5260 100644 --- a/src/js/stendhal/ui/UI.ts +++ b/src/js/stendhal/ui/UI.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; import { UIComponentEnum } from "./UIComponentEnum"; diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index 0850c4d3e8..54b0a2627e 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; import { HeldObject } from "./HeldObject"; diff --git a/src/js/stendhal/ui/component/BagComponent.ts b/src/js/stendhal/ui/component/BagComponent.ts index f342539ee8..2a42fd48d0 100644 --- a/src/js/stendhal/ui/component/BagComponent.ts +++ b/src/js/stendhal/ui/component/BagComponent.ts @@ -11,7 +11,7 @@ import { ItemInventoryComponent } from "./ItemInventoryComponent"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" export class BagComponent extends ItemInventoryComponent { diff --git a/src/js/stendhal/ui/component/BuddyListComponent.ts b/src/js/stendhal/ui/component/BuddyListComponent.ts index 6385ed132c..fcb31e775f 100644 --- a/src/js/stendhal/ui/component/BuddyListComponent.ts +++ b/src/js/stendhal/ui/component/BuddyListComponent.ts @@ -20,7 +20,7 @@ import { Paths } from "../../data/Paths"; import { stendhal } from "stendhal"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * displays the player stats diff --git a/src/js/stendhal/ui/component/ChatInputComponent.ts b/src/js/stendhal/ui/component/ChatInputComponent.ts index 1790452679..2f25f5a479 100644 --- a/src/js/stendhal/ui/component/ChatInputComponent.ts +++ b/src/js/stendhal/ui/component/ChatInputComponent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { ChatPanel } from "../ChatPanel"; import { ui } from "../UI"; diff --git a/src/js/stendhal/ui/component/GroupMemberComponent.ts b/src/js/stendhal/ui/component/GroupMemberComponent.ts index 26649d13de..4d6e2a39ce 100644 --- a/src/js/stendhal/ui/component/GroupMemberComponent.ts +++ b/src/js/stendhal/ui/component/GroupMemberComponent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { ChatInputComponent } from "./ChatInputComponent"; diff --git a/src/js/stendhal/ui/component/GroupPanelComponent.ts b/src/js/stendhal/ui/component/GroupPanelComponent.ts index 0c44d78b73..84d7dec43d 100644 --- a/src/js/stendhal/ui/component/GroupPanelComponent.ts +++ b/src/js/stendhal/ui/component/GroupPanelComponent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { ChatInputComponent } from "./ChatInputComponent"; import { GroupMemberComponent } from "./GroupMemberComponent"; diff --git a/src/js/stendhal/ui/component/ItemContainerImplementation.ts b/src/js/stendhal/ui/component/ItemContainerImplementation.ts index 48caeb0729..ed07422c65 100644 --- a/src/js/stendhal/ui/component/ItemContainerImplementation.ts +++ b/src/js/stendhal/ui/component/ItemContainerImplementation.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; import { ui } from "../UI"; diff --git a/src/js/stendhal/ui/component/KeyringComponent.ts b/src/js/stendhal/ui/component/KeyringComponent.ts index 85e0c476fa..7c808267e4 100644 --- a/src/js/stendhal/ui/component/KeyringComponent.ts +++ b/src/js/stendhal/ui/component/KeyringComponent.ts @@ -11,7 +11,7 @@ import { ItemInventoryComponent } from "./ItemInventoryComponent"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" export class KeyringComponent extends ItemInventoryComponent { diff --git a/src/js/stendhal/ui/component/MiniMapComponent.ts b/src/js/stendhal/ui/component/MiniMapComponent.ts index a4ac3fd6ba..3add856cc7 100644 --- a/src/js/stendhal/ui/component/MiniMapComponent.ts +++ b/src/js/stendhal/ui/component/MiniMapComponent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { Component } from "../toolkit/Component"; diff --git a/src/js/stendhal/ui/component/PlayerEquipmentComponent.ts b/src/js/stendhal/ui/component/PlayerEquipmentComponent.ts index 240109da5c..c4e6e913e8 100644 --- a/src/js/stendhal/ui/component/PlayerEquipmentComponent.ts +++ b/src/js/stendhal/ui/component/PlayerEquipmentComponent.ts @@ -12,7 +12,7 @@ import { Component } from "../toolkit/Component"; import { ItemContainerImplementation } from "./ItemContainerImplementation"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * manage the equipment which is used by the player diff --git a/src/js/stendhal/ui/component/PlayerStatsComponent.ts b/src/js/stendhal/ui/component/PlayerStatsComponent.ts index eee0d9b169..3428f77d75 100644 --- a/src/js/stendhal/ui/component/PlayerStatsComponent.ts +++ b/src/js/stendhal/ui/component/PlayerStatsComponent.ts @@ -22,7 +22,7 @@ import { singletons } from "../../SingletonRepo"; import { Item } from "../../entity/Item"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; diff --git a/src/js/stendhal/ui/component/ZoneInfoComponent.ts b/src/js/stendhal/ui/component/ZoneInfoComponent.ts index 3a00fbbe19..7222a7642c 100644 --- a/src/js/stendhal/ui/component/ZoneInfoComponent.ts +++ b/src/js/stendhal/ui/component/ZoneInfoComponent.ts @@ -11,7 +11,7 @@ import { Component } from "../toolkit/Component"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * zone info diff --git a/src/js/stendhal/ui/dialog/ActionContextMenu.ts b/src/js/stendhal/ui/dialog/ActionContextMenu.ts index 1b9216c93f..387b156318 100644 --- a/src/js/stendhal/ui/dialog/ActionContextMenu.ts +++ b/src/js/stendhal/ui/dialog/ActionContextMenu.ts @@ -14,7 +14,7 @@ import { UIComponentEnum } from "../UIComponentEnum"; import { Component } from "../toolkit/Component"; import { ChatInputComponent } from "../component/ChatInputComponent"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; export class ActionContextMenu extends Component { diff --git a/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts b/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts index de5d08dd1b..caa3315b6a 100644 --- a/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts +++ b/src/js/stendhal/ui/dialog/ChatOptionsDialog.ts @@ -14,7 +14,7 @@ import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { Chat } from "../../util/Chat"; import { singletons } from "../../SingletonRepo"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; diff --git a/src/js/stendhal/ui/dialog/CreateAccountDialog.ts b/src/js/stendhal/ui/dialog/CreateAccountDialog.ts index 595178519a..a81113dfe0 100644 --- a/src/js/stendhal/ui/dialog/CreateAccountDialog.ts +++ b/src/js/stendhal/ui/dialog/CreateAccountDialog.ts @@ -13,7 +13,7 @@ import { ui } from "../UI"; import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { LoginDialog } from "./LoginDialog"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * a dialog to enter username and password diff --git a/src/js/stendhal/ui/dialog/DropQuantitySelectorDialog.ts b/src/js/stendhal/ui/dialog/DropQuantitySelectorDialog.ts index 436185d06a..d0c7bb02f7 100644 --- a/src/js/stendhal/ui/dialog/DropQuantitySelectorDialog.ts +++ b/src/js/stendhal/ui/dialog/DropQuantitySelectorDialog.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { Component } from "../toolkit/Component"; import { singletons } from "../../SingletonRepo"; diff --git a/src/js/stendhal/ui/dialog/EmojiMapDialog.ts b/src/js/stendhal/ui/dialog/EmojiMapDialog.ts index 8138d0d1ef..81414d7f66 100644 --- a/src/js/stendhal/ui/dialog/EmojiMapDialog.ts +++ b/src/js/stendhal/ui/dialog/EmojiMapDialog.ts @@ -13,7 +13,7 @@ import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { singletons } from "../../SingletonRepo"; import { Paths } from "../../data/Paths"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; diff --git a/src/js/stendhal/ui/dialog/ImageViewerDialog.ts b/src/js/stendhal/ui/dialog/ImageViewerDialog.ts index d0c12d9fc0..6b6b9ca3f4 100644 --- a/src/js/stendhal/ui/dialog/ImageViewerDialog.ts +++ b/src/js/stendhal/ui/dialog/ImageViewerDialog.ts @@ -11,7 +11,7 @@ import { Component } from "../toolkit/Component"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; /** diff --git a/src/js/stendhal/ui/dialog/LoginDialog.ts b/src/js/stendhal/ui/dialog/LoginDialog.ts index c64ee550b5..3412b681f4 100644 --- a/src/js/stendhal/ui/dialog/LoginDialog.ts +++ b/src/js/stendhal/ui/dialog/LoginDialog.ts @@ -14,7 +14,7 @@ import { ui } from "../UI"; import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { CreateAccountDialog } from "./CreateAccountDialog"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * a dialog to enter username and password diff --git a/src/js/stendhal/ui/dialog/TradeDialog.ts b/src/js/stendhal/ui/dialog/TradeDialog.ts index c0d16d1cb5..2deb045534 100644 --- a/src/js/stendhal/ui/dialog/TradeDialog.ts +++ b/src/js/stendhal/ui/dialog/TradeDialog.ts @@ -15,7 +15,7 @@ import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { ui } from "../UI"; import { UIComponentEnum } from "../UIComponentEnum"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** * a dialog to display images diff --git a/src/js/stendhal/ui/dialog/TravelLogDialog.ts b/src/js/stendhal/ui/dialog/TravelLogDialog.ts index ceb0910047..ac3a5c7586 100644 --- a/src/js/stendhal/ui/dialog/TravelLogDialog.ts +++ b/src/js/stendhal/ui/dialog/TravelLogDialog.ts @@ -14,7 +14,7 @@ import { DialogContentComponent } from "../toolkit/DialogContentComponent"; import { ui } from "../UI"; import { UIComponentEnum } from "../UIComponentEnum"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; /** diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts index a6c485ae73..c35cc820fd 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts @@ -19,7 +19,7 @@ import { OutfitPaletteColorSelector } from "./OutfitPaletteColorSelector"; import { OutfitPreviewComponent } from "../../component/OutfitPreviewComponent"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../../stendhal"; diff --git a/src/js/stendhal/ui/dialog/settings/GeneralTab.ts b/src/js/stendhal/ui/dialog/settings/GeneralTab.ts index a739b74b75..0beec0ab5e 100644 --- a/src/js/stendhal/ui/dialog/settings/GeneralTab.ts +++ b/src/js/stendhal/ui/dialog/settings/GeneralTab.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { AbstractSettingsTab } from "./AbstractSettingsTab"; diff --git a/src/js/stendhal/ui/joystick/JoystickImpl.ts b/src/js/stendhal/ui/joystick/JoystickImpl.ts index 021f8f5d8a..9b117acb55 100644 --- a/src/js/stendhal/ui/joystick/JoystickImpl.ts +++ b/src/js/stendhal/ui/joystick/JoystickImpl.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; import { ui } from "../UI"; diff --git a/src/js/stendhal/util/Chat.ts b/src/js/stendhal/util/Chat.ts index 109ca33ccc..19d00c30f4 100644 --- a/src/js/stendhal/util/Chat.ts +++ b/src/js/stendhal/util/Chat.ts @@ -14,7 +14,7 @@ import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { ChatLogComponent } from "../ui/component/ChatLogComponent"; -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" /** diff --git a/src/js/stendhal/util/ChatCompletionHelper.ts b/src/js/stendhal/util/ChatCompletionHelper.ts index 1288d7c74d..388401f833 100644 --- a/src/js/stendhal/util/ChatCompletionHelper.ts +++ b/src/js/stendhal/util/ChatCompletionHelper.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; import { SlashActionRepo } from "../SlashActionRepo"; diff --git a/src/js/stendhal/util/FacingHandler.ts b/src/js/stendhal/util/FacingHandler.ts index 539cdc60f2..55d4618296 100644 --- a/src/js/stendhal/util/FacingHandler.ts +++ b/src/js/stendhal/util/FacingHandler.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { Direction } from "./Direction"; diff --git a/src/js/stendhal/util/JSONLoader.ts b/src/js/stendhal/util/JSONLoader.ts index aa9e4d934b..9284092129 100644 --- a/src/js/stendhal/util/JSONLoader.ts +++ b/src/js/stendhal/util/JSONLoader.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; diff --git a/src/js/stendhal/util/KeyHandler.ts b/src/js/stendhal/util/KeyHandler.ts index b8f8f22c17..a4a6372beb 100644 --- a/src/js/stendhal/util/KeyHandler.ts +++ b/src/js/stendhal/util/KeyHandler.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -var marauroa = (window as any).marauroa = (window as any).marauroa || {}; +import { marauroa } from "marauroa" import { ChatCompletionHelper } from "./ChatCompletionHelper"; import { Direction } from "./Direction"; From b328b1aedf3395545efe133cb04b0e8ab20bc74b Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 17 Jan 2026 23:50:58 +0100 Subject: [PATCH 062/162] moved RPObject, RPEvent and RPSlot from Stendhal to Marauroa --- buildtools/ant_modules/dist.xml | 2 +- src/js/stendhal/Client.ts | 7 +- src/js/stendhal/PerceptionListener.ts | 2 +- src/js/stendhal/SingletonRepo.ts | 2 +- src/js/stendhal/data/sound/SoundLayer.ts | 7 +- src/js/stendhal/entity/Chest.ts | 3 +- src/js/stendhal/entity/CorpseSlot.ts | 2 +- src/js/stendhal/entity/Creature.ts | 2 +- src/js/stendhal/entity/Entity.ts | 2 +- src/js/stendhal/entity/InvisibleEntity.ts | 2 - src/js/stendhal/entity/NPC.ts | 2 +- src/js/stendhal/entity/PopupInventory.ts | 5 +- src/js/stendhal/entity/RPObject.ts | 96 ------------------- src/js/stendhal/entity/RPSlot.ts | 66 ------------- src/js/stendhal/entity/TrainingDummy.ts | 1 - src/js/stendhal/event/AttackEvent.ts | 2 +- src/js/stendhal/event/BestiaryEvent.ts | 2 +- src/js/stendhal/event/ChatOptionsEvent.ts | 2 +- src/js/stendhal/{ => event}/EventRegistry.ts | 26 ++--- src/js/stendhal/event/ExamineEvent.ts | 2 +- .../stendhal/event/GlobalVisualEffectEvent.ts | 2 +- src/js/stendhal/event/GroupChangeEvent.ts | 2 +- src/js/stendhal/event/GroupInviteEvent.ts | 2 +- src/js/stendhal/event/ImageEvent.ts | 2 +- src/js/stendhal/event/PlayerLoggedOnEvent.ts | 2 +- src/js/stendhal/event/PlayerLoggedOutEvent.ts | 2 +- src/js/stendhal/event/PrivateTextEvent.ts | 2 +- src/js/stendhal/event/ProgressStatusEvent.ts | 2 +- src/js/stendhal/event/RPEvent.ts | 19 ---- .../stendhal/event/ReachedAchievementEvent.ts | 2 +- src/js/stendhal/event/ShowItemListEvent.ts | 2 +- src/js/stendhal/event/ShowOutfitListEvent.ts | 2 +- src/js/stendhal/event/SoundEvent.ts | 2 +- src/js/stendhal/event/TextEvent.ts | 2 +- src/js/stendhal/event/TradeEvent.ts | 5 +- src/js/stendhal/event/TransitionGraphEvent.ts | 2 +- src/js/stendhal/event/ViewChangeEvent.ts | 2 +- src/js/stendhal/main.ts | 9 +- 38 files changed, 53 insertions(+), 245 deletions(-) delete mode 100644 src/js/stendhal/entity/RPObject.ts delete mode 100644 src/js/stendhal/entity/RPSlot.ts rename src/js/stendhal/{ => event}/EventRegistry.ts (80%) delete mode 100644 src/js/stendhal/event/RPEvent.ts diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index 19677569f6..e1808ef72c 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -679,7 +679,7 @@ -export function version(stendhal) { +export function version(marauroa, stendhal) { stendhal.data = stendhal.data || {}; stendhal.data.build = { diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index 56bfd52cc0..68bf59d762 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -import { marauroa, Deserializer } from "marauroa" +import { marauroa, Deserializer, RPObject } from "marauroa" import { stendhal } from "./stendhal"; import { PerceptionListener } from "./PerceptionListener"; @@ -21,7 +21,6 @@ import { Color } from "./data/color/Color"; import { EntityRegistry } from "./entity/EntityRegistry"; import { Ground } from "./entity/Ground"; -import { RPObject } from "./entity/RPObject"; import { ui } from "./ui/UI"; import { UIComponentEnum } from "./ui/UIComponentEnum"; @@ -79,7 +78,7 @@ export class Client { * Hidden singleton constructor. */ private constructor() { - // do nothing + // empty } /** @@ -260,7 +259,7 @@ export class Client { * Registers Marauroa event handlers. */ registerMarauroaEventHandlers() { - marauroa.clientFramework.onDisconnect = function(_reason: string, _error: string) { + marauroa.clientFramework.onDisconnect = function(_reason: string, _code: number, _wasClean: boolean) { if (!Client.instance.unloading) { Chat.logH("error", "Disconnected from server."); if (window.location.hostname !== "localhost" && window.location.hostname !== "127.0.0.1" && window.location.hostname !== "::1") { diff --git a/src/js/stendhal/PerceptionListener.ts b/src/js/stendhal/PerceptionListener.ts index 7eab288921..412fd7dce1 100644 --- a/src/js/stendhal/PerceptionListener.ts +++ b/src/js/stendhal/PerceptionListener.ts @@ -11,7 +11,7 @@ import { stendhal } from "./stendhal"; -import { RPObject } from "./entity/RPObject"; +import { RPObject } from "marauroa"; /** diff --git a/src/js/stendhal/SingletonRepo.ts b/src/js/stendhal/SingletonRepo.ts index bdfc331d7f..2f6101bfea 100644 --- a/src/js/stendhal/SingletonRepo.ts +++ b/src/js/stendhal/SingletonRepo.ts @@ -10,7 +10,7 @@ ***************************************************************************/ import { Client } from "./Client"; -import { EventRegistry } from "./EventRegistry"; +import { EventRegistry } from "./event/EventRegistry"; import { SlashActionRepo } from "./SlashActionRepo"; import { Zone } from "./entity/Zone"; diff --git a/src/js/stendhal/data/sound/SoundLayer.ts b/src/js/stendhal/data/sound/SoundLayer.ts index 138db35491..667b704ce3 100644 --- a/src/js/stendhal/data/sound/SoundLayer.ts +++ b/src/js/stendhal/data/sound/SoundLayer.ts @@ -16,7 +16,7 @@ import { AbstractEnum } from "../enum/AbstractEnum"; /** * Available layers of sound. * - * NOTE: string names should match `games.stendhal.common.constants.SoundLayer` + * string names should match `games.stendhal.common.constants.SoundLayer` */ export class SoundLayer extends AbstractEnum { @@ -29,9 +29,6 @@ export class SoundLayer extends AbstractEnum { static readonly SFX = new SoundLayer("sfx"); static readonly GUI = new SoundLayer("gui"); - /** Value is required. */ - override readonly value!: string; - private constructor(value: string) { super(value); @@ -47,7 +44,7 @@ export class SoundLayer extends AbstractEnum { static names(): string[] { const names: string[] = []; for (const layer of SoundLayer.layers) { - names.push(layer.value); + names.push(layer.value!); } return names; } diff --git a/src/js/stendhal/entity/Chest.ts b/src/js/stendhal/entity/Chest.ts index 618adbe5b0..ca6ad9aeea 100644 --- a/src/js/stendhal/entity/Chest.ts +++ b/src/js/stendhal/entity/Chest.ts @@ -23,6 +23,7 @@ import { Paths } from "../data/Paths"; import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; +import { Entity } from "./Entity"; let OPEN_SPRITE = { @@ -53,7 +54,7 @@ export class Chest extends PopupInventory { this.sprite = OPEN_SPRITE; this.open = true; } - if (this.isNextTo(marauroa.me)) { + if (this.isNextTo(marauroa.me as Entity)) { this.openInventoryWindow(); } } diff --git a/src/js/stendhal/entity/CorpseSlot.ts b/src/js/stendhal/entity/CorpseSlot.ts index 67e856a36f..23a1f91df8 100644 --- a/src/js/stendhal/entity/CorpseSlot.ts +++ b/src/js/stendhal/entity/CorpseSlot.ts @@ -10,7 +10,7 @@ ***************************************************************************/ import { Corpse } from "./Corpse"; -import { RPSlot } from "./RPSlot"; +import { RPSlot } from "marauroa"; export class CorpseSlot extends RPSlot { diff --git a/src/js/stendhal/entity/Creature.ts b/src/js/stendhal/entity/Creature.ts index 4cfb8b784e..9eee4b1661 100644 --- a/src/js/stendhal/entity/Creature.ts +++ b/src/js/stendhal/entity/Creature.ts @@ -28,7 +28,7 @@ export class Creature extends RPEntity { override titleStyle = "#ffc8c8"; - override set(key: string, value: string) { + override set(key: string, value: any) { super.set(key, value); if (key === "name") { diff --git a/src/js/stendhal/entity/Entity.ts b/src/js/stendhal/entity/Entity.ts index d820972b03..8c1a2ee118 100644 --- a/src/js/stendhal/entity/Entity.ts +++ b/src/js/stendhal/entity/Entity.ts @@ -12,7 +12,7 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Chat } from "../util/Chat"; -import { RPObject } from "./RPObject"; +import { RPObject } from "marauroa"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; diff --git a/src/js/stendhal/entity/InvisibleEntity.ts b/src/js/stendhal/entity/InvisibleEntity.ts index 1d0d29b63a..9b5b27d361 100644 --- a/src/js/stendhal/entity/InvisibleEntity.ts +++ b/src/js/stendhal/entity/InvisibleEntity.ts @@ -12,8 +12,6 @@ import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; -import { stendhal } from "../stendhal"; - export class InvisibleEntity extends Entity { override isVisibleToAction(_filter: boolean) { diff --git a/src/js/stendhal/entity/NPC.ts b/src/js/stendhal/entity/NPC.ts index 1f4f17e660..d4c1b42cb8 100644 --- a/src/js/stendhal/entity/NPC.ts +++ b/src/js/stendhal/entity/NPC.ts @@ -28,7 +28,7 @@ export class NPC extends RPEntity { this["base_hp"] = 100; } - override set(key: string, value: string) { + override set(key: string, value: any) { super.set(key, value); if (key === "name") { diff --git a/src/js/stendhal/entity/PopupInventory.ts b/src/js/stendhal/entity/PopupInventory.ts index eead129ecd..8360622b93 100644 --- a/src/js/stendhal/entity/PopupInventory.ts +++ b/src/js/stendhal/entity/PopupInventory.ts @@ -9,11 +9,10 @@ * * ***************************************************************************/ +import { marauroa, RPObject } from "marauroa"; + import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; -import { RPObject } from "./RPObject"; - -import { marauroa } from "marauroa" export class PopupInventory extends Entity { diff --git a/src/js/stendhal/entity/RPObject.ts b/src/js/stendhal/entity/RPObject.ts deleted file mode 100644 index a521506a92..0000000000 --- a/src/js/stendhal/entity/RPObject.ts +++ /dev/null @@ -1,96 +0,0 @@ -/*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - ***************************************************************************/ - -import { marauroa } from "marauroa" - - -/** - * base class for RPObjects - */ -export class RPObject { - [key: string]: any; - - onEvent(e: any) { - var event = marauroa.rpeventFactory.create(e["c"]); - for (var i in e["a"]) { - if (e["a"].hasOwnProperty(i)) { - event[i] = e["a"][i]; - } - event["_rpclass"] = e["c"]; - } - - // Event slots - for (var slot in e["s"]) { - if (e["s"].hasOwnProperty(slot)) { - event[slot] = e["s"][slot]; - } - } - event.execute(this); - } - - set(key: string, value: object) { - this[key] = value; - } - - setMapEntry(map: string, key: string, value: object) { - this[map][key] = value; - } - - unset(key: string) { - delete this[key]; - } - - unsetMapEntry(map: string, key: string) { - delete this[map][key]; - } - - destroy(_parent: RPObject) { - // do nothing - } - - createSlot(name: string) { - var slot = marauroa.rpslotFactory.create(name); - slot._parent = this; - return slot; - } - - init() { - // do nothing - } - - /** - * Retrieves object width. - */ - public getWidth(): number { - return this["width"] || 1; - } - - /** - * Retrieves object height. - */ - public getHeight(): number { - return this["height"] || 1; - } - - /** - * Checks if this object is nested. - */ - public isContained(): boolean { - return this._parent !== undefined; - } - - /** - * Retrieves the parent object. - */ - public getContainer(): RPObject { - return this._parent; - } -} diff --git a/src/js/stendhal/entity/RPSlot.ts b/src/js/stendhal/entity/RPSlot.ts deleted file mode 100644 index a4785a0a5d..0000000000 --- a/src/js/stendhal/entity/RPSlot.ts +++ /dev/null @@ -1,66 +0,0 @@ -/*************************************************************************** - * (C) Copyright 2003-2026 - Stendhal * - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - ***************************************************************************/ - -/** - * base class for RPSlots - */ -export class RPSlot { - [key: string]: any; - protected _objects: Record[] = []; - - add(value: any) { - if (value && value["id"]) { - this._objects.push(value); - } - } - - get(key: string|number) { - let idx = this.getIndex(key); - if (idx > -1) { - return this._objects[idx]; - } - return undefined; - } - - getByIndex(idx: number) { - return this._objects[idx]; - } - - count() { - return this._objects.length; - } - - getIndex(key: string|number): number { - let i; - let c = this._objects.length; - for (i = 0; i < c; i++) { - if (this._objects[i]["id"] === key) { - return i; - } - } - return -1; - } - - del(key: string|number) { - let idx = this.getIndex(key); - if (idx > -1) { - this._objects.splice(idx, 1); - } - } - - first() { - if (this._objects.length > 0) { - return this._objects[0]; - } - return undefined; - } - -} diff --git a/src/js/stendhal/entity/TrainingDummy.ts b/src/js/stendhal/entity/TrainingDummy.ts index 7d3ab13445..776227e83d 100644 --- a/src/js/stendhal/entity/TrainingDummy.ts +++ b/src/js/stendhal/entity/TrainingDummy.ts @@ -13,7 +13,6 @@ import { Paths } from "../data/Paths"; import { NPC } from "./NPC"; import { marauroa } from "marauroa" -import { stendhal } from "../stendhal"; export class TrainingDummy extends NPC { diff --git a/src/js/stendhal/event/AttackEvent.ts b/src/js/stendhal/event/AttackEvent.ts index 5c2ebbc947..4d01c198e3 100644 --- a/src/js/stendhal/event/AttackEvent.ts +++ b/src/js/stendhal/event/AttackEvent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" export class AttackEvent extends RPEvent { diff --git a/src/js/stendhal/event/BestiaryEvent.ts b/src/js/stendhal/event/BestiaryEvent.ts index 5c2af7af2b..df1eea3ca4 100644 --- a/src/js/stendhal/event/BestiaryEvent.ts +++ b/src/js/stendhal/event/BestiaryEvent.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { ui } from "../ui/UI"; diff --git a/src/js/stendhal/event/ChatOptionsEvent.ts b/src/js/stendhal/event/ChatOptionsEvent.ts index aa74128e0a..919e02a38e 100644 --- a/src/js/stendhal/event/ChatOptionsEvent.ts +++ b/src/js/stendhal/event/ChatOptionsEvent.ts @@ -11,7 +11,7 @@ import { Chat } from "../util/Chat"; import { ChatOptionsDialog } from "../ui/dialog/ChatOptionsDialog"; -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { marauroa } from "marauroa" diff --git a/src/js/stendhal/EventRegistry.ts b/src/js/stendhal/event/EventRegistry.ts similarity index 80% rename from src/js/stendhal/EventRegistry.ts rename to src/js/stendhal/event/EventRegistry.ts index e58b5ac86b..76da3507c5 100644 --- a/src/js/stendhal/EventRegistry.ts +++ b/src/js/stendhal/event/EventRegistry.ts @@ -12,25 +12,25 @@ import { marauroa } from "marauroa" import { AttackEvent } from "event/AttackEvent"; -import { BestiaryEvent } from "./event/BestiaryEvent"; -import { ChatOptionsEvent } from "./event/ChatOptionsEvent"; -import { ExamineEvent } from "./event/ExamineEvent"; +import { BestiaryEvent } from "./BestiaryEvent"; +import { ChatOptionsEvent } from "./ChatOptionsEvent"; +import { ExamineEvent } from "./ExamineEvent"; import { GlobalVisualEffectEvent } from "event/GlobalVisualEffectEvent"; -import { GroupChangeEvent } from "./event/GroupChangeEvent"; -import { GroupInviteEvent } from "./event/GroupInviteEvent"; +import { GroupChangeEvent } from "./GroupChangeEvent"; +import { GroupInviteEvent } from "./GroupInviteEvent"; import { ImageEvent } from "event/ImageEvent"; -import { PlayerLoggedOnEvent } from "./event/PlayerLoggedOnEvent"; -import { PlayerLoggedOutEvent } from "./event/PlayerLoggedOutEvent"; +import { PlayerLoggedOnEvent } from "./PlayerLoggedOnEvent"; +import { PlayerLoggedOutEvent } from "./PlayerLoggedOutEvent"; import { PrivateTextEvent } from "event/PrivateTextEvent"; -import { ProgressStatusEvent } from "./event/ProgressStatusEvent"; +import { ProgressStatusEvent } from "./ProgressStatusEvent"; import { ReachedAchievementEvent } from "event/ReachedAchievementEvent"; -import { ShowItemListEvent } from "./event/ShowItemListEvent"; -import { ShowOutfitListEvent } from "./event/ShowOutfitListEvent"; -import { SoundEvent } from "./event/SoundEvent"; +import { ShowItemListEvent } from "./ShowItemListEvent"; +import { ShowOutfitListEvent } from "./ShowOutfitListEvent"; +import { SoundEvent } from "./SoundEvent"; import { TextEvent } from "event/TextEvent"; -import { TradeEvent } from "./event/TradeEvent"; +import { TradeEvent } from "./TradeEvent"; import { TransitionGraphEvent } from "event/TransitionGraphEvent"; -import { ViewChangeEvent } from "./event/ViewChangeEvent"; +import { ViewChangeEvent } from "./ViewChangeEvent"; export class EventRegistry { diff --git a/src/js/stendhal/event/ExamineEvent.ts b/src/js/stendhal/event/ExamineEvent.ts index 4414760dd8..108fbc7911 100644 --- a/src/js/stendhal/event/ExamineEvent.ts +++ b/src/js/stendhal/event/ExamineEvent.ts @@ -11,7 +11,7 @@ import { ImageViewerDialog } from "../ui/dialog/ImageViewerDialog"; import { ui } from "../ui/UI"; -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { marauroa } from "marauroa" diff --git a/src/js/stendhal/event/GlobalVisualEffectEvent.ts b/src/js/stendhal/event/GlobalVisualEffectEvent.ts index 382b56566e..989ceb2cb9 100644 --- a/src/js/stendhal/event/GlobalVisualEffectEvent.ts +++ b/src/js/stendhal/event/GlobalVisualEffectEvent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" export class GlobalVisualEffectEvent extends RPEvent { diff --git a/src/js/stendhal/event/GroupChangeEvent.ts b/src/js/stendhal/event/GroupChangeEvent.ts index f9d492506e..372edb65fe 100644 --- a/src/js/stendhal/event/GroupChangeEvent.ts +++ b/src/js/stendhal/event/GroupChangeEvent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { GroupPanelComponent } from "../ui/component/GroupPanelComponent"; diff --git a/src/js/stendhal/event/GroupInviteEvent.ts b/src/js/stendhal/event/GroupInviteEvent.ts index 31918a46f4..455f457a41 100644 --- a/src/js/stendhal/event/GroupInviteEvent.ts +++ b/src/js/stendhal/event/GroupInviteEvent.ts @@ -10,7 +10,7 @@ ***************************************************************************/ -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { GroupPanelComponent } from "../ui/component/GroupPanelComponent"; diff --git a/src/js/stendhal/event/ImageEvent.ts b/src/js/stendhal/event/ImageEvent.ts index e898e18c58..8c744e5305 100644 --- a/src/js/stendhal/event/ImageEvent.ts +++ b/src/js/stendhal/event/ImageEvent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" export class ImageEvent extends RPEvent { diff --git a/src/js/stendhal/event/PlayerLoggedOnEvent.ts b/src/js/stendhal/event/PlayerLoggedOnEvent.ts index be4429a1cf..ca409baa91 100644 --- a/src/js/stendhal/event/PlayerLoggedOnEvent.ts +++ b/src/js/stendhal/event/PlayerLoggedOnEvent.ts @@ -12,7 +12,7 @@ import { stendhal } from "../stendhal"; -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" /** diff --git a/src/js/stendhal/event/PlayerLoggedOutEvent.ts b/src/js/stendhal/event/PlayerLoggedOutEvent.ts index a47ff73702..df741f4973 100644 --- a/src/js/stendhal/event/PlayerLoggedOutEvent.ts +++ b/src/js/stendhal/event/PlayerLoggedOutEvent.ts @@ -12,7 +12,7 @@ import { stendhal } from "../stendhal"; -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" export class PlayerLoggedOutEvent extends RPEvent { diff --git a/src/js/stendhal/event/PrivateTextEvent.ts b/src/js/stendhal/event/PrivateTextEvent.ts index 775b8532f8..5066b5d65d 100644 --- a/src/js/stendhal/event/PrivateTextEvent.ts +++ b/src/js/stendhal/event/PrivateTextEvent.ts @@ -10,7 +10,7 @@ ***************************************************************************/ import { Chat } from "util/Chat"; -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { stendhal } from "stendhal"; /** diff --git a/src/js/stendhal/event/ProgressStatusEvent.ts b/src/js/stendhal/event/ProgressStatusEvent.ts index 1eb9c50a73..8e09564274 100644 --- a/src/js/stendhal/event/ProgressStatusEvent.ts +++ b/src/js/stendhal/event/ProgressStatusEvent.ts @@ -13,7 +13,7 @@ import { FloatingWindow } from "../ui/toolkit/FloatingWindow"; import { TravelLogDialog } from "../ui/dialog/TravelLogDialog"; import { ui } from "../ui/UI"; import { UIComponentEnum } from "../ui/UIComponentEnum"; -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { stendhal } from "stendhal"; diff --git a/src/js/stendhal/event/RPEvent.ts b/src/js/stendhal/event/RPEvent.ts deleted file mode 100644 index 209ee6e5bb..0000000000 --- a/src/js/stendhal/event/RPEvent.ts +++ /dev/null @@ -1,19 +0,0 @@ -/*************************************************************************** - * (C) Copyright 2005-2023 - Stendhal * - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - ***************************************************************************/ - -/** - * abstract base class for Events from the server - */ -export abstract class RPEvent { - - abstract execute(entity: any): void; - -}; diff --git a/src/js/stendhal/event/ReachedAchievementEvent.ts b/src/js/stendhal/event/ReachedAchievementEvent.ts index be9505fee0..a0882ac3f0 100644 --- a/src/js/stendhal/event/ReachedAchievementEvent.ts +++ b/src/js/stendhal/event/ReachedAchievementEvent.ts @@ -10,7 +10,7 @@ ***************************************************************************/ import { stendhal } from "stendhal"; -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" /** * displays an achievement banner diff --git a/src/js/stendhal/event/ShowItemListEvent.ts b/src/js/stendhal/event/ShowItemListEvent.ts index 8edfde1174..d7c31db99d 100644 --- a/src/js/stendhal/event/ShowItemListEvent.ts +++ b/src/js/stendhal/event/ShowItemListEvent.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { ui } from "../ui/UI"; import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; diff --git a/src/js/stendhal/event/ShowOutfitListEvent.ts b/src/js/stendhal/event/ShowOutfitListEvent.ts index bc9e8cfec4..a0c8dc5a4c 100644 --- a/src/js/stendhal/event/ShowOutfitListEvent.ts +++ b/src/js/stendhal/event/ShowOutfitListEvent.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { ui } from "../ui/UI"; import { DialogContentComponent } from "../ui/toolkit/DialogContentComponent"; diff --git a/src/js/stendhal/event/SoundEvent.ts b/src/js/stendhal/event/SoundEvent.ts index 0160332efb..55382bad48 100644 --- a/src/js/stendhal/event/SoundEvent.ts +++ b/src/js/stendhal/event/SoundEvent.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { SoundID } from "../data/sound/SoundID"; import { SoundManager } from "../data/sound/SoundManager"; diff --git a/src/js/stendhal/event/TextEvent.ts b/src/js/stendhal/event/TextEvent.ts index 4451a11a95..5436fe1cc2 100644 --- a/src/js/stendhal/event/TextEvent.ts +++ b/src/js/stendhal/event/TextEvent.ts @@ -10,7 +10,7 @@ ***************************************************************************/ import { Entity } from "entity/Entity"; -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" /** * text events diff --git a/src/js/stendhal/event/TradeEvent.ts b/src/js/stendhal/event/TradeEvent.ts index 1b5ee10f44..09bf9bac94 100644 --- a/src/js/stendhal/event/TradeEvent.ts +++ b/src/js/stendhal/event/TradeEvent.ts @@ -15,10 +15,11 @@ import { TradeDialog } from "../ui/dialog/TradeDialog"; import { UIComponentEnum } from "../ui/UIComponentEnum"; import { ui } from "../ui/UI"; -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" import { stendhal } from "../stendhal"; import { marauroa } from "marauroa" +import { Player } from "../entity/Player"; /** * handles player trade events @@ -39,7 +40,7 @@ export class TradeEvent extends RPEvent { if (dialog) { let partner = marauroa.currentZone[this["partner_id"]]; - dialog.updateTradeState(marauroa.me, partner, this["user_trade_state"], this["partner_trade_state"]); + dialog.updateTradeState(marauroa.me as Player, partner, this["user_trade_state"], this["partner_trade_state"]); } } diff --git a/src/js/stendhal/event/TransitionGraphEvent.ts b/src/js/stendhal/event/TransitionGraphEvent.ts index 0fd85559d8..fc4807c532 100644 --- a/src/js/stendhal/event/TransitionGraphEvent.ts +++ b/src/js/stendhal/event/TransitionGraphEvent.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" export class TransitionGraphEvent extends RPEvent { diff --git a/src/js/stendhal/event/ViewChangeEvent.ts b/src/js/stendhal/event/ViewChangeEvent.ts index 7067e6cbf7..afffe9dd5b 100644 --- a/src/js/stendhal/event/ViewChangeEvent.ts +++ b/src/js/stendhal/event/ViewChangeEvent.ts @@ -13,7 +13,7 @@ import { stendhal } from "../stendhal"; import { Canvas } from "util/Types"; -import { RPEvent } from "./RPEvent"; +import { RPEvent } from "marauroa" /** diff --git a/src/js/stendhal/main.ts b/src/js/stendhal/main.ts index f6e61506f5..55aa254ebf 100644 --- a/src/js/stendhal/main.ts +++ b/src/js/stendhal/main.ts @@ -9,17 +9,12 @@ * * ***************************************************************************/ +import { marauroa } from "marauroa"; import { stendhal } from "./stendhal"; import { Client } from "./Client"; declare var require: any; (window as any)["Zlib"] = require("marauroa/inflate").Zlib; -require("marauroa/marauroa"); -require("marauroa/client-framework"); -require("marauroa/message-factory"); -require("marauroa/perception"); -require("marauroa/rpfactory"); -require("marauroa/deserializer"); let build = require("marauroa/build"); require("./data/sha3"); @@ -29,7 +24,7 @@ require("./data/sha3"); * Initializes "stendhal" object. */ function initGlobals() { - build.version(stendhal); + build.version(marauroa, stendhal); stendhal.main = Client.get(); } From 45cd2ac30ef96e5b58746fa88c70089849573c6d Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 18 Jan 2026 14:13:13 +0100 Subject: [PATCH 063/162] moved onPerceptionEnd method from Client to StendhalPerceptionListener --- src/js/stendhal/Client.ts | 29 ++-------------- src/js/stendhal/PerceptionListener.ts | 50 ++++++++++++++++++--------- src/js/stendhal/tsconfig.json | 6 ++-- 3 files changed, 39 insertions(+), 46 deletions(-) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index 68bf59d762..14eaebc62d 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -12,7 +12,7 @@ import { marauroa, Deserializer, RPObject } from "marauroa" import { stendhal } from "./stendhal"; -import { PerceptionListener } from "./PerceptionListener"; +import { StendhalPerceptionListener } from "./PerceptionListener"; import { singletons } from "./SingletonRepo"; import { Paths } from "./data/Paths"; @@ -25,9 +25,6 @@ import { Ground } from "./entity/Ground"; import { ui } from "./ui/UI"; import { UIComponentEnum } from "./ui/UIComponentEnum"; -import { BuddyListComponent } from "./ui/component/BuddyListComponent"; -import { MiniMapComponent } from "./ui/component/MiniMapComponent"; -import { PlayerEquipmentComponent } from "./ui/component/PlayerEquipmentComponent"; import { ZoneInfoComponent } from "./ui/component/ZoneInfoComponent"; import { ChooseCharacterDialog } from "./ui/dialog/ChooseCharacterDialog"; @@ -62,6 +59,7 @@ export class Client { /** Singleton instance. */ private static instance: Client; + public loaded = false; /** @@ -354,28 +352,7 @@ export class Client { // update user interface on perceptions if (document.getElementById("viewport")) { // override perception listener - marauroa.perceptionListener = new PerceptionListener(marauroa.perceptionListener); - marauroa.perceptionListener.onPerceptionEnd = function(_type: Int8Array, _timestamp: number) { - stendhal.zone.sortEntities(); - (ui.get(UIComponentEnum.MiniMap) as MiniMapComponent).draw(); - (ui.get(UIComponentEnum.BuddyList) as BuddyListComponent).update(); - stendhal.ui.equip.update(); - (ui.get(UIComponentEnum.PlayerEquipment) as PlayerEquipmentComponent).update(); - if (!this.loaded) { - this.loaded = true; - // delay visibile change of client a little to allow for initialisation in the background for a smoother experience - window.setTimeout(function() { - let body = document.getElementById("body")!; - body.style.cursor = "auto"; - document.getElementById("client")!.style.display = "block"; - document.getElementById("loginpopup")!.style.display = "none"; - - // initialize observer after UI is ready - singletons.getUIUpdateObserver().init(); - ui.onDisplayReady(); - }, 300); - } - } + marauroa.perceptionListener = new StendhalPerceptionListener(); } } diff --git a/src/js/stendhal/PerceptionListener.ts b/src/js/stendhal/PerceptionListener.ts index 412fd7dce1..b865009101 100644 --- a/src/js/stendhal/PerceptionListener.ts +++ b/src/js/stendhal/PerceptionListener.ts @@ -9,29 +9,23 @@ * * ***************************************************************************/ +import { ui } from "ui/UI"; import { stendhal } from "./stendhal"; -import { RPObject } from "marauroa"; +import { RPObject, PerceptionListener } from "marauroa"; +import { UIComponentEnum } from "ui/UIComponentEnum"; +import { MiniMapComponent } from "ui/component/MiniMapComponent"; +import { BuddyListComponent } from "ui/component/BuddyListComponent"; +import { PlayerEquipmentComponent } from "ui/component/PlayerEquipmentComponent"; +import { singletons } from "SingletonRepo"; +import { Client } from "Client"; /** * Class to override `marauroa.perceptionListener` & handle creating * User object. */ -export class PerceptionListener { - [key: string]: any; - private readonly _super: any; - - - constructor(perceptionListener: any) { - this._super = perceptionListener; - for (const prop of Object.getOwnPropertyNames(perceptionListener)) { - if (typeof(this[prop]) === "undefined") { - // members & methods that are not overridden by this class - this[prop] = perceptionListener[prop]; - } - } - } +export class StendhalPerceptionListener extends PerceptionListener { /** * Action when an object is added to the world. @@ -42,7 +36,7 @@ export class PerceptionListener { * `true` if object was added. * @see marauroa.perceptionListener.onAdded */ - onAdded(obj: RPObject): boolean { + override onAdded(obj: RPObject): boolean { if (obj["c"] === "player") { if (obj.hasOwnProperty("a")) { if (obj["a"]["name"] === stendhal.session.getCharName()) { @@ -51,6 +45,28 @@ export class PerceptionListener { } } } - return this._super.onAdded(obj); + return super.onAdded(obj); + } + + override onPerceptionEnd(_type: Int8Array, _timestamp: number) { + stendhal.zone.sortEntities(); + (ui.get(UIComponentEnum.MiniMap) as MiniMapComponent).draw(); + (ui.get(UIComponentEnum.BuddyList) as BuddyListComponent).update(); + stendhal.ui.equip.update(); + (ui.get(UIComponentEnum.PlayerEquipment) as PlayerEquipmentComponent).update(); + if (!Client.get().loaded) { + Client.get().loaded = true; + // delay visibile change of client a little to allow for initialisation in the background for a smoother experience + window.setTimeout(function() { + let body = document.getElementById("body")!; + body.style.cursor = "auto"; + document.getElementById("client")!.style.display = "block"; + document.getElementById("loginpopup")!.style.display = "none"; + + // initialize observer after UI is ready + singletons.getUIUpdateObserver().init(); + ui.onDisplayReady(); + }, 300); + } } } diff --git a/src/js/stendhal/tsconfig.json b/src/js/stendhal/tsconfig.json index 03ff0b466b..2e38d48a2f 100644 --- a/src/js/stendhal/tsconfig.json +++ b/src/js/stendhal/tsconfig.json @@ -1,14 +1,14 @@ { "compilerOptions": { "baseUrl": ".", - "lib": ["dom", "es2015"], - "module": "commonjs", + "lib": ["dom", "es2022"], + "module": "node20", "noImplicitOverride": true, "outDir": "../../../build/ts", "rootDir": ".", "sourceMap": true, "strict": true, - "target": "es6" + "target": "es2022" }, "typedocOptions": { "entryPoints": ["."], From 621a43579a2dee6a2437582e754d4c020a11b8c0 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 18 Jan 2026 21:05:29 +0100 Subject: [PATCH 064/162] fixed import --- src/js/stendhal/entity/Corpse.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index 72d7b76b4a..786af0113e 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -21,7 +21,7 @@ import { Chat } from "../util/Chat"; import { PopupInventory } from "./PopupInventory"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -import { MarauroaUtils } from "marauroa/MarauroaUtils"; +import { MarauroaUtils } from "marauroa"; import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; From 5ae5d3343858578d78b84104143135c06613cc32 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 18 Jan 2026 21:41:30 +0100 Subject: [PATCH 065/162] updated marauroa.jar --- libs/marauroa.jar | Bin 485790 -> 487036 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/marauroa.jar b/libs/marauroa.jar index 174b2cbe81f3a02265ea2988f213ed89d9d6b924..bba625e86341b1839bc578d0b1746ac0298d07a3 100644 GIT binary patch delta 36374 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 L;oM8OTqpY^~TLD3Y`b2$=tOyaEW`fBJVIg#H0Y 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 Date: Tue, 13 Jan 2026 17:12:19 -0800 Subject: [PATCH 066/162] Make compile_stendhaltextclient build target alias of compile_textclient --- buildtools/ant_modules/dist.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index e1808ef72c..563c912fbc 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -539,7 +539,7 @@ - + @@ -560,6 +560,8 @@ + + From 6eeff4766dbd86d3cf3bdbcfa919244f2f8bad0d Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 13 Jan 2026 17:22:23 -0800 Subject: [PATCH 067/162] Make compile_stendhaltools target alias of compile_tools --- buildtools/ant_modules/tools.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildtools/ant_modules/tools.xml b/buildtools/ant_modules/tools.xml index 2083c75fd8..d9702109d7 100644 --- a/buildtools/ant_modules/tools.xml +++ b/buildtools/ant_modules/tools.xml @@ -4,7 +4,7 @@ - + @@ -28,6 +28,9 @@ + + + From 26c47237490459d11832de8d2ca5457a9608293b Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 13 Jan 2026 19:42:45 -0800 Subject: [PATCH 068/162] Move build properties to sub-module --- build.xml | 67 +------------------------ buildtools/ant_modules/properties.xml | 72 +++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 66 deletions(-) create mode 100644 buildtools/ant_modules/properties.xml diff --git a/build.xml b/build.xml index aeb0e308fb..bc6e07a8aa 100644 --- a/build.xml +++ b/build.xml @@ -1,81 +1,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/buildtools/ant_modules/properties.xml b/buildtools/ant_modules/properties.xml new file mode 100644 index 0000000000..24c2fc3695 --- /dev/null +++ b/buildtools/ant_modules/properties.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 08873546ba896e687752944b2f0e5773db6d5ee1 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 13 Jan 2026 18:26:07 -0800 Subject: [PATCH 069/162] Add help info to ant build --- build.xml | 16 +++++ buildtools/ant_modules/info.xml | 88 +++++++++++++++++++++++++++ buildtools/ant_modules/properties.xml | 5 ++ 3 files changed, 109 insertions(+) create mode 100644 buildtools/ant_modules/info.xml diff --git a/build.xml b/build.xml index bc6e07a8aa..0809387463 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,21 @@ + +Project: + Name: .......... ${game_name} + Version: ....... ${version} + Root: .......... ${basedir} + +Build system: + Ant version: ... ${ant.version.number} + Ant home: ...... ${ant.location} + Java version: .. ${java.version} + Java home: ..... ${java.home} + +Execute `ant help` for more information. + + @@ -11,6 +26,7 @@ + diff --git a/buildtools/ant_modules/info.xml b/buildtools/ant_modules/info.xml new file mode 100644 index 0000000000..d5ad04c365 --- /dev/null +++ b/buildtools/ant_modules/info.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildtools/ant_modules/properties.xml b/buildtools/ant_modules/properties.xml index 24c2fc3695..76fdfc3ae4 100644 --- a/buildtools/ant_modules/properties.xml +++ b/buildtools/ant_modules/properties.xml @@ -7,6 +7,11 @@ Properties are immutable: whoever sets a property first freezes it for the rest of the build; they are most definitely not variables. --> + + + + + From 2df3243f2d0f9f6ac68ad4237b645c99ca215ef0 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 13 Jan 2026 18:26:34 -0800 Subject: [PATCH 070/162] Make 'help' default target --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 0809387463..f438a3c6ea 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,6 @@ - + Project: Name: .......... ${game_name} From 38f5c0124dbe520bff59ac586f99ef2e61c6d945 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 13 Jan 2026 18:34:54 -0800 Subject: [PATCH 071/162] Remove build target descriptions Descriptions now available in `ant help` target. --- buildtools/ant_modules/apps.xml | 3 +- buildtools/ant_modules/clean.xml | 9 ++-- buildtools/ant_modules/dist.xml | 76 +++++++++++++++++++----------- buildtools/ant_modules/docs.xml | 3 +- buildtools/ant_modules/locale.xml | 6 ++- buildtools/ant_modules/main.xml | 9 ++-- buildtools/ant_modules/maps.xml | 12 +++-- buildtools/ant_modules/package.xml | 12 +++-- buildtools/ant_modules/testing.xml | 15 ++++-- buildtools/ant_modules/tools.xml | 21 ++++++--- 10 files changed, 109 insertions(+), 57 deletions(-) diff --git a/buildtools/ant_modules/apps.xml b/buildtools/ant_modules/apps.xml index e1a07af700..632566cf60 100644 --- a/buildtools/ant_modules/apps.xml +++ b/buildtools/ant_modules/apps.xml @@ -161,7 +161,8 @@ - + + diff --git a/buildtools/ant_modules/clean.xml b/buildtools/ant_modules/clean.xml index f4d61adb72..eb73fe81aa 100644 --- a/buildtools/ant_modules/clean.xml +++ b/buildtools/ant_modules/clean.xml @@ -2,7 +2,8 @@ - + + @@ -18,14 +19,16 @@ - + + - + + diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index 563c912fbc..0e83962482 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -19,13 +19,15 @@ - + + Built client and server for NetBeans. - + + + - + - + + - + + - + + @@ -104,7 +109,8 @@ - + + @@ -179,7 +185,8 @@ - + + @@ -340,7 +347,8 @@ - + + @@ -392,10 +400,12 @@ - + + - + + @@ -404,7 +414,8 @@ - + + @@ -414,10 +425,12 @@ - + + - + + @@ -446,7 +459,8 @@ - + + @@ -539,7 +553,8 @@ - + + @@ -563,7 +578,9 @@ - + + + @@ -599,8 +616,8 @@ - - + + @@ -622,7 +639,8 @@ - + + @@ -658,8 +676,9 @@ + - + @@ -756,7 +775,8 @@ export function version(marauroa, stendhal) { - + + @@ -765,7 +785,8 @@ export function version(marauroa, stendhal) { - + + @@ -786,11 +807,12 @@ export function version(marauroa, stendhal) { - - + + - + + diff --git a/buildtools/ant_modules/docs.xml b/buildtools/ant_modules/docs.xml index b4ed151203..4e6cd05dfb 100644 --- a/buildtools/ant_modules/docs.xml +++ b/buildtools/ant_modules/docs.xml @@ -12,7 +12,8 @@ - + + diff --git a/buildtools/ant_modules/locale.xml b/buildtools/ant_modules/locale.xml index 452774ca2e..bdcb875ce6 100644 --- a/buildtools/ant_modules/locale.xml +++ b/buildtools/ant_modules/locale.xml @@ -2,7 +2,8 @@ - + + @@ -11,7 +12,8 @@ - + + diff --git a/buildtools/ant_modules/main.xml b/buildtools/ant_modules/main.xml index 9d6c1e2c20..9891b0664c 100644 --- a/buildtools/ant_modules/main.xml +++ b/buildtools/ant_modules/main.xml @@ -2,7 +2,8 @@ - + + @@ -89,7 +90,8 @@ - + + @@ -167,7 +169,8 @@ - + + diff --git a/buildtools/ant_modules/maps.xml b/buildtools/ant_modules/maps.xml index 8402027f26..1f12acb6fa 100644 --- a/buildtools/ant_modules/maps.xml +++ b/buildtools/ant_modules/maps.xml @@ -4,7 +4,8 @@ - + + @@ -23,7 +24,8 @@ - + + @@ -58,7 +60,8 @@ - + + @@ -85,7 +88,8 @@ - + + diff --git a/buildtools/ant_modules/package.xml b/buildtools/ant_modules/package.xml index 7b0356c940..1d260be037 100644 --- a/buildtools/ant_modules/package.xml +++ b/buildtools/ant_modules/package.xml @@ -16,7 +16,8 @@ - + + @@ -46,7 +47,8 @@ - + + @@ -74,7 +76,8 @@ - + + @@ -107,7 +110,8 @@ - + + diff --git a/buildtools/ant_modules/testing.xml b/buildtools/ant_modules/testing.xml index bcb48f75ca..a0bfbea6cd 100644 --- a/buildtools/ant_modules/testing.xml +++ b/buildtools/ant_modules/testing.xml @@ -7,7 +7,8 @@ - + + @@ -21,7 +22,8 @@ - + + @@ -63,7 +65,8 @@ - + + database_implementation=games.stendhal.server.core.engine.StendhalPlayerDatabase factory_implementation=games.stendhal.server.core.engine.StendhalRPObjectFactory @@ -85,7 +88,8 @@ d = 9017093486007323270605414717455737376618092805104733236083857811315606869372 - + + @@ -147,7 +151,8 @@ d = 9017093486007323270605414717455737376618092805104733236083857811315606869372 - + + diff --git a/buildtools/ant_modules/tools.xml b/buildtools/ant_modules/tools.xml index d9702109d7..cbe23600ba 100644 --- a/buildtools/ant_modules/tools.xml +++ b/buildtools/ant_modules/tools.xml @@ -4,7 +4,8 @@ - + + @@ -31,7 +32,8 @@ - + + @@ -72,10 +74,12 @@ - + + - + + @@ -111,7 +115,8 @@ - + + @@ -127,7 +132,8 @@ - + + Creating update from ${version.old} to ${version} @@ -171,8 +177,9 @@ + - + From 2bec3a151b6266402481dc256f2b1e64fff58ce5 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Mon, 19 Jan 2026 18:00:34 -0800 Subject: [PATCH 072/162] Remove unneeded aliases --- buildtools/ant_modules/dist.xml | 3 --- buildtools/ant_modules/info.xml | 2 -- buildtools/ant_modules/tools.xml | 4 ---- 3 files changed, 9 deletions(-) diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index 0e83962482..094028d19d 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -807,9 +807,6 @@ export function version(marauroa, stendhal) { - - - diff --git a/buildtools/ant_modules/info.xml b/buildtools/ant_modules/info.xml index d5ad04c365..b91c23d397 100644 --- a/buildtools/ant_modules/info.xml +++ b/buildtools/ant_modules/info.xml @@ -77,8 +77,6 @@ - - diff --git a/buildtools/ant_modules/tools.xml b/buildtools/ant_modules/tools.xml index cbe23600ba..67bf2c0136 100644 --- a/buildtools/ant_modules/tools.xml +++ b/buildtools/ant_modules/tools.xml @@ -74,10 +74,6 @@ - - - - From 8c93122d1e17dc2614d8ea3425fc448b78a1a339 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Mon, 19 Jan 2026 18:07:18 -0800 Subject: [PATCH 073/162] Rename target locale_build_template to locale_template --- buildtools/ant_modules/info.xml | 2 +- buildtools/ant_modules/locale.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/ant_modules/info.xml b/buildtools/ant_modules/info.xml index b91c23d397..68c7ef2400 100644 --- a/buildtools/ant_modules/info.xml +++ b/buildtools/ant_modules/info.xml @@ -73,7 +73,7 @@ - + diff --git a/buildtools/ant_modules/locale.xml b/buildtools/ant_modules/locale.xml index bdcb875ce6..66f25bb768 100644 --- a/buildtools/ant_modules/locale.xml +++ b/buildtools/ant_modules/locale.xml @@ -3,7 +3,7 @@ - + From 4666911be68941b33d5b543c499e6fa81474e642 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 00:04:15 -0800 Subject: [PATCH 074/162] Don't need English language file --- data/languages/en.txt | 1779 ----------------------------------------- 1 file changed, 1779 deletions(-) delete mode 100644 data/languages/en.txt diff --git a/data/languages/en.txt b/data/languages/en.txt deleted file mode 100644 index 2368fd02bd..0000000000 --- a/data/languages/en.txt +++ /dev/null @@ -1,1779 +0,0 @@ -wooden arrow=wooden arrow -You see a wooden arrow. With a supply of arrows in one hand and a bow in the other you can attack from a distance.=You see a wooden arrow. With a supply of arrows in one hand and a bow in the other you can attack from a distance. -steel arrow=steel arrow -You see a shining steel arrow. With plenty of these, and a good bow, you'll be a formidable archer.=You see a shining steel arrow. With plenty of these, and a good bow, you'll be a formidable archer. -golden arrow=golden arrow -You see a golden arrow. With a fist full of these and a good bow, you will surely take down your enemies quicker.=You see a golden arrow. With a fist full of these and a good bow, you will surely take down your enemies quicker. -power arrow=power arrow -You see a power arrow. The sting of this arrow will surely defeat your enemies, when equipped with a bow.=You see a power arrow. The sting of this arrow will surely defeat your enemies, when equipped with a bow. -barbarian armor=barbarian armor -You see a suit of barbarian armor. It's dirty and smelly, but still, rather strong.=You see a suit of barbarian armor. It's dirty and smelly, but still, rather strong. -black armor=black armor -You see a suit of black armor. Does it put you in a dark mood?=You see a suit of black armor. Does it put you in a dark mood? -blue armor=blue armor -You see a suit of blue armor. The color is stunning azure.=You see a suit of blue armor. The color is stunning azure. -chain armor=chain armor -You see a suit of chain armor. Perhaps even if you don't need it, you can sell it.=You see a suit of chain armor. Perhaps even if you don't need it, you can sell it. -chaos armor=chaos armor -You see a suit of chaos armor. The reflecting contrasting colors make no sense to you.=You see a suit of chaos armor. The reflecting contrasting colors make no sense to you. -dress=dress -You see a dress, which provides practically no defense. It is barely worth picking up.=You see a dress, which provides practically no defense. It is barely worth picking up. -dwarvish armor=dwarvish armor -You see a dwarvish armor. It's made with ingenuity and skill.=You see a dwarvish armor. It's made with ingenuity and skill. -elvish armor=elvish armor -You see a suit of elvish armor. It's made from tree leaves! But somehow constructed to give strong defense.=You see a suit of elvish armor. It's made from tree leaves! But somehow constructed to give strong defense. -enhanced chainmail=enhanced chainmail -You see a robust suit of enhanced chainmail. The links are closely spaced so even the sharpest point should not pierce it.=You see a robust suit of enhanced chainmail. The links are closely spaced so even the sharpest point should not pierce it. -golden armor=golden armor -You see a suit of golden armor. It's made from the best materials with great attention to detail.=You see a suit of golden armor. It's made from the best materials with great attention to detail. -golden chainmail=golden chainmail -You see a valuable suit of golden chainmail. It is crafted from fine links of expensive metal.=You see a valuable suit of golden chainmail. It is crafted from fine links of expensive metal. -ice armor=ice armor -You see a suit of ice armor, to protect even the coldest of hearts.=You see a suit of ice armor, to protect even the coldest of hearts. -iron scale armor=iron scale armor -You see a suit of iron scale armor, whose rounded scales will protect you from many blows.=You see a suit of iron scale armor, whose rounded scales will protect you from many blows. -leather armor=leather armor -You see a worn suit of leather armor. It will provide only minimal protection.=You see a worn suit of leather armor. It will provide only minimal protection. -leather cuirass=leather cuirass -You see a leather cuirass, well made but still able to be pierced by sharp swords.=You see a leather cuirass, well made but still able to be pierced by sharp swords. -leather scale armor=leather scale armor -You see a suit of leather scale armor. The leather is toughened somehow for better protection.=You see a suit of leather scale armor. The leather is toughened somehow for better protection. -magic plate armor=magic plate armor -You see a suit of magic plate armor. The steel is well tempered and the suit is very strong.=You see a suit of magic plate armor. The steel is well tempered and the suit is very strong. -mainio armor=mainio armor -You see a strange strange suit of mainio armor. What it lacks in subtlety it makes up for with strength.=You see a strange strange suit of mainio armor. What it lacks in subtlety it makes up for with strength. -mithril armor=mithril armor -You see a suit of mithril armor. Its tightly woven links are truly amazing.=You see a suit of mithril armor. Its tightly woven links are truly amazing. -pauldroned iron cuirass=pauldroned iron cuirass -You see a formidable pauldroned iron cuirass. The pauldrons (shoulder pieces) will protect your upper half.=You see a formidable pauldroned iron cuirass. The pauldrons (shoulder pieces) will protect your upper half. -pauldroned leather cuirass=pauldroned leather cuirass -You see a pauldroned leather cuirass. It was crafted to withstand minor attacks.=You see a pauldroned leather cuirass. It was crafted to withstand minor attacks. -plate armor=plate armor -You see a suit of plate armor. You imagine it would be heavy but the steel is well tempered and the suit is very strong.=You see a suit of plate armor. You imagine it would be heavy but the steel is well tempered and the suit is very strong. -red armor=red armor -You see a suit of red armor. The color is a striking crimson.=You see a suit of red armor. The color is a striking crimson. -scale armor=scale armor -You see a suit of scale armor. It is not flexible like chain, but will be a better defense.=You see a suit of scale armor. It is not flexible like chain, but will be a better defense. -shadow armor=shadow armor -You see a suit of shadow armor. It's hard to decide with what it is made, it is so dark.=You see a suit of shadow armor. It's hard to decide with what it is made, it is so dark. -stone armor=stone armor -You see a suit of stone armor. Swords will crumble if they try to pierce it.=You see a suit of stone armor. Swords will crumble if they try to pierce it. -studded armor=studded armor -You see a suit of studded armor. Some studs are loose or rusty but it is still fit for purpose.=You see a suit of studded armor. Some studs are loose or rusty but it is still fit for purpose. -xeno armor=xeno armor -You see a suit of xeno armor. The colors remind you of the xenocium hybrid creature.=You see a suit of xeno armor. The colors remind you of the xenocium hybrid creature. -axe=axe -You see a rusty but heavy axe. What it lacks in sharpness it makes up for in weight.=You see a rusty but heavy axe. What it lacks in sharpness it makes up for in weight. -bardiche=bardiche -You see a rare and powerful bardiche.=You see a rare and powerful bardiche. -battle axe=battle axe -You see a battle axe. It is well crafted and sharp despite its age.=You see a battle axe. It is well crafted and sharp despite its age. -black halberd=black halberd -You see a black halberd. It's immensely heavy so will make huge blows but you can only swing it at a very slow rate.=You see a black halberd. It's immensely heavy so will make huge blows but you can only swing it at a very slow rate. -black scythe=black scythe -You see a black scythe. Its attack is awesome for a farming tool.=You see a black scythe. Its attack is awesome for a farming tool. -chaos axe=chaos axe -You see a chaos axe. The handle is some alloy you can't recognize and the blade is golden colored, but thinking too long about it makes you confused.=You see a chaos axe. The handle is some alloy you can't recognize and the blade is golden colored, but thinking too long about it makes you confused. -durin axe=durin axe -You see a durin axe, a great prize from the dwarves.=You see a durin axe, a great prize from the dwarves. -golden twoside axe=golden twoside axe -You see a golden twoside axe. This axe is a rare find.=You see a golden twoside axe. This axe is a rare find. -halberd=halberd -You see a rare halberd, with an axe's blade fused onto a shaft. It is both heavy and keen-edged.=You see a rare halberd, with an axe's blade fused onto a shaft. It is both heavy and keen-edged. -hand axe=hand axe -You see a hand axe, well worn from years of use but may prove useful.=You see a hand axe, well worn from years of use but may prove useful. -magic twoside axe=magic twoside axe -You see a magic twoside axe. The nature of the magic isn't clear to you.=You see a magic twoside axe. The nature of the magic isn't clear to you. -old scythe=old scythe -You see an old scythe, it used to be weapon of death. But now it is only a useful tool for farming.=You see an old scythe, it used to be weapon of death. But now it is only a useful tool for farming. -scythe=scythe -You see the weapon of death - a scythe. It looks dangerous but perhaps also a useful tool for farming.=You see the weapon of death - a scythe. It looks dangerous but perhaps also a useful tool for farming. -sickle=sickle -You see a sickle, it is a useful tool for farming.=You see a sickle, it is a useful tool for farming. -small axe=small axe -You see a small axe. It appears well made but you suspect it is too light to do much damage.=You see a small axe. It appears well made but you suspect it is too light to do much damage. -twoside axe=twoside axe -You see a well crafted twoside axe.=You see a well crafted twoside axe. -black book=black book -You see the black book that Jynath kept out for so long.=You see the black book that Jynath kept out for so long. -blue book=blue book -You see a book with the words GEMS AND MINERALS on the front cover.=You see a book with the words GEMS AND MINERALS on the front cover. -black boots=black boots -You stub your toe on this pair of black boots. Perhaps they bring you bad luck?=You stub your toe on this pair of black boots. Perhaps they bring you bad luck? -blue boots=blue boots -You see a pair of blue boots.=You see a pair of blue boots. -chain boots=chain boots -You see a pair of chain boots, quite rusty but still strong.=You see a pair of chain boots, quite rusty but still strong. -chaos boots=chaos boots -You see a pair of chaos boots. Your steps are unsteady in them, but the extra defense they give is worth it.=You see a pair of chaos boots. Your steps are unsteady in them, but the extra defense they give is worth it. -elvish boots=elvish boots -You see a pair of elvish boots.=You see a pair of elvish boots. -golden boots=golden boots -You see a pair of golden boots. They will be heavy to wear but well worth their weight.=You see a pair of golden boots. They will be heavy to wear but well worth their weight. -green thing boots=green thing boots -You see a pair of green thing boots. They're slimy inside, ewwww.=You see a pair of green thing boots. They're slimy inside, ewwww. -killer boots=killer boots -You see a high heeled pair of killer boots. Are you brave enough to wear them?=You see a high heeled pair of killer boots. Are you brave enough to wear them? -leather boots=leather boots -You see a simple pair of leather boots to give your feet some protection.=You see a simple pair of leather boots to give your feet some protection. -mainio boots=mainio boots -You see a pair of mainio boots. It's hard to believe that boots looking like this would protect your feet so well as they do.=You see a pair of mainio boots. It's hard to believe that boots looking like this would protect your feet so well as they do. -mithril boots=mithril boots -You see a sparkling set of mithril boots.=You see a sparkling set of mithril boots. -red boots=red boots -You see a pair of red boots, the color reminds you of fresh blood.=You see a pair of red boots, the color reminds you of fresh blood. -shadow boots=shadow boots -You see a pair of shadow boots. You can't fathom what they are made of.=You see a pair of shadow boots. You can't fathom what they are made of. -steel boots=steel boots -You see a pair of steel boots, fit for any soldier.=You see a pair of steel boots, fit for any soldier. -stone boots=stone boots -You see a pair of stone boots. They may be heavy, but they protect your feet well.=You see a pair of stone boots. They may be heavy, but they protect your feet well. -studded boots=studded boots -You see a pair of worn studded boots with moderate protection for your feet.=You see a pair of worn studded boots with moderate protection for your feet. -xeno boots=xeno boots -You see a fine specimen of craftmanship, a pair of xeno boots.=You see a fine specimen of craftmanship, a pair of xeno boots. -present=present -You see a present. Open it.=You see a present. Open it. -basket=basket -You see an easter basket. Look inside.=You see an easter basket. Look inside. -stocking=stocking -You see a christmas stocking. Look inside.=You see a christmas stocking. Look inside. -black cloak=black cloak -You see a black cloak. The last owner had black thoughts. Will you?=You see a black cloak. The last owner had black thoughts. Will you? -black dragon cloak=black dragon cloak -You see a torn section from an enormous black dragon cloak. You're very lucky: the piece is just the right size for a human to wear.=You see a torn section from an enormous black dragon cloak. You're very lucky: the piece is just the right size for a human to wear. -blue dragon cloak=blue dragon cloak -You see a blue dragon cloak. The weave is tight and strong, though you wish the color drew less attention.=You see a blue dragon cloak. The weave is tight and strong, though you wish the color drew less attention. -blue elf cloak=blue elf cloak -You see a blue elf cloak. The material is thick and warm.=You see a blue elf cloak. The material is thick and warm. -blue striped cloak=blue striped cloak -You see a fashionable blue striped cloak.=You see a fashionable blue striped cloak. -bone dragon cloak=bone dragon cloak -You see a bone dragon cloak. It's incredibly old, like its last owner.=You see a bone dragon cloak. It's incredibly old, like its last owner. -chaos cloak=chaos cloak -You see a chaos cloak. The colors look like oil shimmering on a puddle.=You see a chaos cloak. The colors look like oil shimmering on a puddle. -cloak=cloak -You see a simple cloth cloak.=You see a simple cloth cloak. -dwarf cloak=dwarf cloak -You see a dwarf cloak. Apparently this passes for fashion in some parts, but to you it looks more functional than fashionable.=You see a dwarf cloak. Apparently this passes for fashion in some parts, but to you it looks more functional than fashionable. -elf cloak=elf cloak -You see a white elf cloak. It doesn't look very warm.=You see a white elf cloak. It doesn't look very warm. -elvish cloak=elvish cloak -You see an elvish cloak. The material is dark, but thick and warm.=You see an elvish cloak. The material is dark, but thick and warm. -golden cloak=golden cloak -You see a golden cloak. See how the light glistens off the gold, it is a prized possession.=You see a golden cloak. See how the light glistens off the gold, it is a prized possession. -green dragon cloak=green dragon cloak -You see a huge green dragon cloak. It's probably too big for you but, even dragging on the floor it will provide excellent protection.=You see a huge green dragon cloak. It's probably too big for you but, even dragging on the floor it will provide excellent protection. -lich cloak=lich cloak -You see a purple lich cloak. It's stained with blood - yours, from the previous undead owner, or perhaps the blood of his enemies...=You see a purple lich cloak. It's stained with blood - yours, from the previous undead owner, or perhaps the blood of his enemies... -mainio cloak=mainio cloak -You see a mainio cloak. Its flashing colors are absurd! But you wear it because it's very well made.=You see a mainio cloak. Its flashing colors are absurd! But you wear it because it's very well made. -mithril cloak=mithril cloak -You see a mithril cloak. Its weave is so fine and its looks are breathtaking.=You see a mithril cloak. Its weave is so fine and its looks are breathtaking. -red cloak=red cloak -You see a red cloak covered in polka dots. It's terribly snazzy.=You see a red cloak covered in polka dots. It's terribly snazzy. -red dragon cloak=red dragon cloak -You see a red dragon cloak. He didn't have one for a long time but finally caved in to peer pressure and got one.=You see a red dragon cloak. He didn't have one for a long time but finally caved in to peer pressure and got one. -rift cloak=rift cloak -You see a rift cloak. Almost useless in the battle, but saves your life when you enter a magical rift.=You see a rift cloak. Almost useless in the battle, but saves your life when you enter a magical rift. -shadow cloak=shadow cloak -You see a shadow cloak, in colors of the shadow armor.=You see a shadow cloak, in colors of the shadow armor. -stone cloak=stone cloak -You see a stone cloak. It's hard to tell how it was made, as the fibres look like narrow threads of mineral.=You see a stone cloak. It's hard to tell how it was made, as the fibres look like narrow threads of mineral. -vampire cloak=vampire cloak -You see a vibrant red vampire cloak. Wearing it sends a shiver down your spine.=You see a vibrant red vampire cloak. Wearing it sends a shiver down your spine. -xeno cloak=xeno cloak -You see a xeno cloak. It's heavy and thick, giving you a good protection.=You see a xeno cloak. It's heavy and thick, giving you a good protection. -chaos hammer=chaos hammer -You see a chaos hammer. It is a fearsome weapon.=You see a chaos hammer. It is a fearsome weapon. -club=club -You see a wooden club. It won't kill much but is better than no weapon.=You see a wooden club. It won't kill much but is better than no weapon. -club of thorns=club of thorns -You see the club of thorns. The thorns are full with blood of tortured humans. It is hugely powerful but will drain your life to use it.=You see the club of thorns. The thorns are full with blood of tortured humans. It is hugely powerful but will drain your life to use it. -enhanced mace=enhanced mace -You see an enhanced mace. The heavy attacking end makes it hard to balance.=You see an enhanced mace. The heavy attacking end makes it hard to balance. -flail=flail -You see a flail. Swinging it in circles will tire you but it will be an effective weapon.=You see a flail. Swinging it in circles will tire you but it will be an effective weapon. -golden hammer=golden hammer -You see a valuable golden hammer. This golden weapon may be worth a lot to someone. It has a slow rate of attack.=You see a valuable golden hammer. This golden weapon may be worth a lot to someone. It has a slow rate of attack. -golden mace=golden mace -You see a shining golden mace. Despite looking ornamental, it is sharp enough to do some damage.=You see a shining golden mace. Despite looking ornamental, it is sharp enough to do some damage. -hammer=hammer -You see a common hammer. It is heavy enough that you should be able to bludgeon your enemies with it, but only slowly=You see a common hammer. It is heavy enough that you should be able to bludgeon your enemies with it, but only slowly -ice war hammer=ice war hammer -You see a ice war hammer. The last owner must have been huge, to wield it.=You see a ice war hammer. The last owner must have been huge, to wield it. -mace=mace -You see a mace, much neglected in years of use.=You see a mace, much neglected in years of use. -morning star=morning star -You see a morning star. This is a very rare item indeed.=You see a morning star. This is a very rare item indeed. -necromancers staff=necromancers staff -You see a cunningly beautiful staff. If you listen carefully you can hear its previous owners' souls screaming from within it.=You see a cunningly beautiful staff. If you listen carefully you can hear its previous owners' souls screaming from within it. -rod of the gm=rod of the gm -You see a rod of the GM. This rod is reserved for those with special powers, be careful not to let it fall into the wrong hands.=You see a rod of the GM. This rod is reserved for those with special powers, be careful not to let it fall into the wrong hands. -skull staff=skull staff -You see a rare skull staff. It appears mystical but will work like any other staff.=You see a rare skull staff. It appears mystical but will work like any other staff. -staff=staff -You see a staff. This is a seldom seen or used weapon.=You see a staff. This is a seldom seen or used weapon. -ugmash=ugmash -You see a huge ugmash. It can attack with a faster rate than many other clubs.=You see a huge ugmash. It can attack with a faster rate than many other clubs. -vulcano hammer=vulcano hammer -You see a vulcano hammer. It's said to be a weapon of a God, but attacks with a snail like pace.=You see a vulcano hammer. It's said to be a weapon of a God, but attacks with a snail like pace. -war hammer=war hammer -You see a huge war hammer. It seems strong but is so heavy that you can only lift it to attack every so often..=You see a huge war hammer. It seems strong but is so heavy that you can only lift it to attack every so often.. -empty sack=empty sack -You see an empty sack. It will not stand up, unless you fill it first.=You see an empty sack. It will not stand up, unless you fill it first. -flask=flask -You see a flask. This flask is good for storing medicine.=You see a flask. This flask is good for storing medicine. -eared bottle=eared bottle -You see an eared bottle. It is empty, someone drank the contents.=You see an eared bottle. It is empty, someone drank the contents. -fat bottle=fat bottle -You see a fat bottle. It is empty, someone drank the contents.=You see a fat bottle. It is empty, someone drank the contents. -slim bottle=slim bottle -You see a slim bottle. It is empty, someone drank the contents.=You see a slim bottle. It is empty, someone drank the contents. -empty goblet=empty goblet -You see an empty goblet. You wonder what could it hold.=You see an empty goblet. You wonder what could it hold. -goblet=goblet -You see a goblet. You look at its contents, and shiver at the blood inside.=You see a goblet. You look at its contents, and shiver at the blood inside. -keyring=keyring -You see a keyring.=You see a keyring. -red emotion crystal=red emotion crystal -You see a red emotion crystal. It feels hot to the touch.=You see a red emotion crystal. It feels hot to the touch. -purple emotion crystal=purple emotion crystal -You see a purple emotion crystal. It feels cold to the touch.=You see a purple emotion crystal. It feels cold to the touch. -yellow emotion crystal=yellow emotion crystal -You see a yellow emotion crystal. It energizes you.=You see a yellow emotion crystal. It energizes you. -pink emotion crystal=pink emotion crystal -You see a pink emotion crystal. It almost feels soft.=You see a pink emotion crystal. It almost feels soft. -blue emotion crystal=blue emotion crystal -You see a blue emotion crystal. While holding it your worries seem to disappear.=You see a blue emotion crystal. While holding it your worries seem to disappear. -note=note -You see a note.=You see a note. -coupon=coupon -You see a coupon.=You see a coupon. -closed envelope=closed envelope -You see a closed envelope.=You see a closed envelope. -opened envelope=opened envelope -You see an opened envelope.=You see an opened envelope. -sealed envelope=sealed envelope -You see a sealed envelope.=You see a sealed envelope. -unsealed envelope=unsealed envelope -You see an unsealed envelope.=You see an unsealed envelope. -assassins id=assassins id -You see an assassin's ID. Perhaps this can be put to good use.=You see an assassin's ID. Perhaps this can be put to good use. -map=map -You see a map.=You see a map. -blank scroll=blank scroll -You see a rolled up blank scroll.=You see a rolled up blank scroll. -ice scroll=ice scroll -You see a scroll, circled by ice crystals. You can feel its cold aura.=You see a scroll, circled by ice crystals. You can feel its cold aura. -fierywater=fierywater -You see a bottle of fierywater. Do not drink it pure, you would evaporate!=You see a bottle of fierywater. Do not drink it pure, you would evaporate! -mild koboldish torcibud=mild koboldish torcibud -You see a bottle of mild koboldish torcibud. It will help you recover when you're all bruised and battered.=You see a bottle of mild koboldish torcibud. It will help you recover when you're all bruised and battered. -strong koboldish torcibud=strong koboldish torcibud -You see a bottle of strong koboldish torcibud. It will help you recover when you're all bruised and battered.=You see a bottle of strong koboldish torcibud. It will help you recover when you're all bruised and battered. -vsop koboldish torcibud=vsop koboldish torcibud -You see a bottle of VSOP koboldish torcibud, specially aged in oak casks wrapped by the darkness of a dungeon cellar. It will help you recover when you're all bruised and battered.=You see a bottle of VSOP koboldish torcibud, specially aged in oak casks wrapped by the darkness of a dungeon cellar. It will help you recover when you're all bruised and battered. -apple juice=apple juice -You see apple juice. On a hot summer day, it would taste great.=You see apple juice. On a hot summer day, it would taste great. -beer=beer -You see a beer. On a hot summer day, it would taste great.=You see a beer. On a hot summer day, it would taste great. -wine=wine -You see a glass of red wine. It will quench your thirst.=You see a glass of red wine. It will quench your thirst. -water=water -You see a bottle of fresh spring water. It's really tasty and fresh.=You see a bottle of fresh spring water. It's really tasty and fresh. -pina colada=pina colada -You see a pina colada. It looks delicious but tastes dangerously strong!=You see a pina colada. It looks delicious but tastes dangerously strong! -tea=tea -You see a lovely cup of tea.=You see a lovely cup of tea. -milk=milk -You see a small bottle of fresh milk.=You see a small bottle of fresh milk. -antidote=antidote -You see an antidote, to cure you of poison and protect you for a while.=You see an antidote, to cure you of poison and protect you for a while. -greater antidote=greater antidote -You see a greater antidote, to cure you of poison and protect you for a long while.=You see a greater antidote, to cure you of poison and protect you for a long while. -mana=mana -You see an bottle of mana, to increase your mana rapidly.=You see an bottle of mana, to increase your mana rapidly. -poison=poison -You see a bottle of poison. Don't drink it!=You see a bottle of poison. Don't drink it! -greater poison=greater poison -You see a greater poison. Don't drink it!=You see a greater poison. Don't drink it! -deadly poison=deadly poison -You see a deadly poison. Don't drink it!=You see a deadly poison. Don't drink it! -disease poison=disease poison -You see a disease poison. Be careful, it's wicked.=You see a disease poison. Be careful, it's wicked. -mega poison=mega poison -You see a mega poison. This is some wicked poison.=You see a mega poison. This is some wicked poison. -twilight elixir=twilight elixir -You see a bottle of medicinal elixir.=You see a bottle of medicinal elixir. -minor potion=minor potion -You see a minor potion. It's not much but may save you in a tight spot.=You see a minor potion. It's not much but may save you in a tight spot. -soup=soup -You see a bowl of soup. Its contents fill you up.=You see a bowl of soup. Its contents fill you up. -fish soup=fish soup -You see a bowl of fish soup. Its contents fill you up.=You see a bowl of fish soup. Its contents fill you up. -potion=potion -You see a potion. Take it to battle and you may survive longer.=You see a potion. Take it to battle and you may survive longer. -greater potion=greater potion -You see a greater potion, invaluable in battle.=You see a greater potion, invaluable in battle. -mega potion=mega potion -You see a mega potion. It strengthens greatly.=You see a mega potion. It strengthens greatly. -love potion=love potion -You see a love potion. It looks powerful so take care to use it carefully!=You see a love potion. It looks powerful so take care to use it carefully! -rhosyd=rhosyd -You see a beautiful and rare rhosyd flower.=You see a beautiful and rare rhosyd flower. -rose=rose -You see a single red rose. It smells heavenly.=You see a single red rose. It smells heavenly. -lilia=lilia -You see a lilia, a single precious bloom.=You see a lilia, a single precious bloom. -daisies=daisies -You see a bunch of daisies. They are cheap and cheerful!=You see a bunch of daisies. They are cheap and cheerful! -pansy=pansy -You see a pansy, so colorful and beautiful.=You see a pansy, so colorful and beautiful. -zantedeschia=zantedeschia -You see a zantedeschia, a delicate bloom with the sweetest fragrance.=You see a zantedeschia, a delicate bloom with the sweetest fragrance. -apple=apple -You see a nice shiny apple.=You see a nice shiny apple. -black apple=black apple -You see a black apple. It must be a gift from lil Johnnnny. He's the guy with black items.=You see a black apple. It must be a gift from lil Johnnnny. He's the guy with black items. -purple apple=purple apple -You see a purple apple. It is loaded with memories= -banana=banana -You see a banana. Take care of monkeys when you have them in your bag!=You see a banana. Take care of monkeys when you have them in your bag! -cherry=cherry -You see a cherry. Its tangy taste revives you a little.=You see a cherry. Its tangy taste revives you a little. -coconut=coconut -You see a coconut. Luckily it's already cracked and you can drink from it.=You see a coconut. Luckily it's already cracked and you can drink from it. -grapes=grapes -You see a bunch of grapes. They look quite juicy and tasty.=You see a bunch of grapes. They look quite juicy and tasty. -olive=olive -You see a small ripe olive. It can be eaten or used to create olive oil.=You see a small ripe olive. It can be eaten or used to create olive oil. -pear=pear -You see a pear. Its lovely smell convinces you of taking it.=You see a pear. Its lovely smell convinces you of taking it. -pineapple=pineapple -You see a tropical pineapple.=You see a tropical pineapple. -pomegranate=pomegranate -You see a pomegranate. If you eat it, you will be in a great shape soon.=You see a pomegranate. If you eat it, you will be in a great shape soon. -watermelon=watermelon -You see a watermelon. It freshes your throat during hot summer days.=You see a watermelon. It freshes your throat during hot summer days. -artichoke=artichoke -You see an artichoke. It can be an ingredient, or you can eat it.=You see an artichoke. It can be an ingredient, or you can eat it. -broccoli=broccoli -You see a bunch of broccoli.=You see a bunch of broccoli. -carrot=carrot -You see a carrot. It can be an ingredient, or you can eat it.=You see a carrot. It can be an ingredient, or you can eat it. -cauliflower=cauliflower -You see a fresh head of cauliflower.=You see a fresh head of cauliflower. -courgette=courgette -You see a courgette. It can be an ingredient, or you can eat it.=You see a courgette. It can be an ingredient, or you can eat it. -collard=collard -You see a collard. It's rare and strangely magical.=You see a collard. It's rare and strangely magical. -garlic=garlic -You see some fresh garlic.=You see some fresh garlic. -leek=leek -You see a fresh leek.=You see a fresh leek. -onion=onion -You see an onion.=You see an onion. -salad=salad -You see a salad.=You see a salad. -spinach=spinach -You see spinach. It is enriched with vitamins.=You see spinach. It is enriched with vitamins. -tomato=tomato -You see a tomato, put it in a salad or eat it.=You see a tomato, put it in a salad or eat it. -egg=egg -You see an egg.=You see an egg. -button mushroom=button mushroom -You see a button mushroom. It can be an ingredient, or you can eat it.=You see a button mushroom. It can be an ingredient, or you can eat it. -porcini=porcini -You see a porcini. It can be an ingredient, or you can eat it.=You see a porcini. It can be an ingredient, or you can eat it. -toadstool=toadstool -You see a toadstool. Beware!=You see a toadstool. Beware! -char=char -You see a char, with a fleshy pink belly.=You see a char, with a fleshy pink belly. -cod=cod -You see a cod.=You see a cod. -mackerel=mackerel -You see a mackerel.=You see a mackerel. -perch=perch -You see a perch.=You see a perch. -roach=roach -You see a roach.=You see a roach. -clownfish=clownfish -You see a striped clownfish.=You see a striped clownfish. -red lionfish=red lionfish -You see a venomous coral reef red lionfish.=You see a venomous coral reef red lionfish. -surgeonfish=surgeonfish -You see a bright blue surgeonfish.=You see a bright blue surgeonfish. -trout=trout -You see a trout.=You see a trout. -bread=bread -You see a loaf of bread. It is freshly baked and ready to eat.=You see a loaf of bread. It is freshly baked and ready to eat. -crepes suzette=crepes suzette -You see a crepes suzette topped with hot chocolate sauce.=You see a crepes suzette topped with hot chocolate sauce. -apple pie=apple pie -You see a delicious apple pie, made with only genuine ingredients.=You see a delicious apple pie, made with only genuine ingredients. -cherry pie=cherry pie -You see a delicious cherry pie, made with only genuine ingredients.=You see a delicious cherry pie, made with only genuine ingredients. -pie=pie -You see a meat and vegetable pie.=You see a meat and vegetable pie. -fish pie=fish pie -You see a fish and leek pie. It's not too stodgy so you can eat it faster than a meat pie.=You see a fish and leek pie. It's not too stodgy so you can eat it faster than a meat pie. -sandwich=sandwich -You see a ham and cheese sandwich.=You see a ham and cheese sandwich. -smoked ham=smoked ham -You see a smoked ham.=You see a smoked ham. -smoked meat=smoked meat -You see a piece of smoked meat.=You see a piece of smoked meat. -smoked cod=smoked cod -You see a smoked cod.=You see a smoked cod. -smoked trout=smoked trout -You see a smoked trout.=You see a smoked trout. -sugar=sugar -You see a sack of raw sugar.=You see a sack of raw sugar. -butter=butter -You see some butter. It is an ingredient or can be eaten if you like.=You see some butter. It is an ingredient or can be eaten if you like. -honey=honey -You see a jar of sticky sweet honey. It's the clear runny kind.=You see a jar of sticky sweet honey. It's the clear runny kind. -icecream=icecream -You see a wafer cone with vanilla ice cream and a chocolate flake.=You see a wafer cone with vanilla ice cream and a chocolate flake. -licorice=licorice -You see some delicious licorice. Your mouth waters.=You see some delicious licorice. Your mouth waters. -hotdog=hotdog -You see what looks like a tasty hotdog on a bun.=You see what looks like a tasty hotdog on a bun. -cheeseydog=cheeseydog -You see what looks like a tasty cheeseydog on a bun.=You see what looks like a tasty cheeseydog on a bun. -cheese sausage=cheese sausage -You see what looks like a tasty cheese sausage.=You see what looks like a tasty cheese sausage. -sausage=sausage -You see what looks like a tasty sausage.=You see what looks like a tasty sausage. -tuna sandwich=tuna sandwich -You see what looks like tuna sandwich.=You see what looks like tuna sandwich. -chocolate shake=chocolate shake -You see a scrumptious chocolate shake. Absolutely NO calories.=You see a scrumptious chocolate shake. Absolutely NO calories. -vanilla shake=vanilla shake -You see a yummy vanilla shake. Absolutely NO calories.=You see a yummy vanilla shake. Absolutely NO calories. -cheese=cheese -You see some cheese. Eat it and see what happens.=You see some cheese. Eat it and see what happens. -chicken=chicken -You see a tasty leg of chicken.=You see a tasty leg of chicken. -chocolate bar=chocolate bar -You see an absolutely yummy chocolate bar.=You see an absolutely yummy chocolate bar. -fairy cake=fairy cake -You see a luscious fairy cake with icing and sprinkles on top.=You see a luscious fairy cake with icing and sprinkles on top. -ham=ham -You see a juicy ham.=You see a juicy ham. -meat=meat -You see a piece of meat.=You see a piece of meat. -easter egg=easter egg -You see a lovely chocolate easter egg. It's huge!=You see a lovely chocolate easter egg. It's huge! -small easter egg=small easter egg -You see a small chocolate easter egg. Yummy!=You see a small chocolate easter egg. Yummy! -grilled steak=grilled steak -You see a fresh grilled steak. It smells awesome and is really juicy.=You see a fresh grilled steak. It smells awesome and is really juicy. -pizza=pizza -You see a tasty pizza, and hope they put extra cheese on it.=You see a tasty pizza, and hope they put extra cheese on it. -leather helmet=leather helmet -You see a leather helmet, it seems more like a hat than a defensive item.=You see a leather helmet, it seems more like a hat than a defensive item. -trophy helmet=trophy helmet -You see a Trophy Helmet. Those who were brave and finished the death match, win this helmet.=You see a Trophy Helmet. Those who were brave and finished the death match, win this helmet. -robins hat=robins hat -You see a robins hat. It's cute but that's about it.=You see a robins hat. It's cute but that's about it. -studded helmet=studded helmet -You see a studded helmet, it should protect your head against cuts but perhaps not hard blows.=You see a studded helmet, it should protect your head against cuts but perhaps not hard blows. -elvish hat=elvish hat -You see an elvish hat. The elf craftmanship has made the leafy material stronger than one would think.=You see an elvish hat. The elf craftmanship has made the leafy material stronger than one would think. -chain helmet=chain helmet -You see a solid chain helmet, it will be excellent protection for your head.=You see a solid chain helmet, it will be excellent protection for your head. -viking helmet=viking helmet -You see a viking helmet. The previous owner wore it to many battles.=You see a viking helmet. The previous owner wore it to many battles. -aventail=aventail -You see a aventail. It's a clever design.=You see a aventail. It's a clever design. -blue helmet=blue helmet -You see a brand new blue helmet.=You see a brand new blue helmet. -red helmet=red helmet -You see a red helmet, it reminds you of a jester's hat but you can be sure it has better protection than that.=You see a red helmet, it reminds you of a jester's hat but you can be sure it has better protection than that. -golden helmet=golden helmet -You see a heavy golden helmet. The thick metal should protect you against almost anything.=You see a heavy golden helmet. The thick metal should protect you against almost anything. -horned golden helmet=horned golden helmet -You see a horned golden helmet.=You see a horned golden helmet. -shadow helmet=shadow helmet -You see a heavy shadow helmet. Instead of shining, it darkly gleams.=You see a heavy shadow helmet. Instead of shining, it darkly gleams. -xeno helmet=xeno helmet -You see a xeno helmet.=You see a xeno helmet. -chaos helmet=chaos helmet -You see a chaos helmet.=You see a chaos helmet. -mainio helmet=mainio helmet -You see a strange mainio helmet. You can barely see when wearing it, but it protects your head very well.=You see a strange mainio helmet. You can barely see when wearing it, but it protects your head very well. -magic chain helmet=magic chain helmet -You see a magic chain helmet.=You see a magic chain helmet. -liberty helmet=liberty helmet -You see the liberty helmet. It's light and strong, you feel free wearing it.=You see the liberty helmet. It's light and strong, you feel free wearing it. -black helmet=black helmet -You see a black helmet.=You see a black helmet. -mithril helmet=mithril helmet -You see a mithril helmet.=You see a mithril helmet. -arandula=arandula -You see a arandula. It has medicinal properties, if the right person uses it.=You see a arandula. It has medicinal properties, if the right person uses it. -kokuda=kokuda -You see a kokuda. It has medicinal properties, if the right person uses it.=You see a kokuda. It has medicinal properties, if the right person uses it. -kekik=kekik -You see a kekik. It is a herb which can have healing properties.=You see a kekik. It is a herb which can have healing properties. -mandragora=mandragora -You see a root of mandragora. It has medicinal properties, if the right person uses it.=You see a root of mandragora. It has medicinal properties, if the right person uses it. -sclaria=sclaria -You see the herb sclaria. The smell is calming.=You see the herb sclaria. The smell is calming. -reindeer moss=reindeer moss -You see reindeer moss, something that grows only around Semos. It is quite a delicacy to reindeer, but extremely bitter to humans.=You see reindeer moss, something that grows only around Semos. It is quite a delicacy to reindeer, but extremely bitter to humans. -emerald=emerald -You see an emerald, a precious gemstone.=You see an emerald, a precious gemstone. -sapphire=sapphire -You see a sapphire, a precious gemstone.=You see a sapphire, a precious gemstone. -carbuncle=carbuncle -You see a carbuncle, a precious gemstone related to the garnet.=You see a carbuncle, a precious gemstone related to the garnet. -obsidian=obsidian -You see a piece of obsidian, it's known as volcanic glass because it forms when lava cools rapidly. When used as a gemstone it may look jet black or silvery grey, depending on how it is cut.=You see a piece of obsidian, it's known as volcanic glass because it forms when lava cools rapidly. When used as a gemstone it may look jet black or silvery grey, depending on how it is cut. -diamond=diamond -You see a diamond, not just a beautiful gem but also the hardest naturally occurring material .=You see a diamond, not just a beautiful gem but also the hardest naturally occurring material . -black pearl=black pearl -You see a black pearl, so dark and shiny.=You see a black pearl, so dark and shiny. -dungeon silver key=dungeon silver key -You see a silver dungeon key. Use it only if you are brave.=You see a silver dungeon key. Use it only if you are brave. -lich gold key=lich gold key -You see a golden lich key. It will open the door to terrible things.=You see a golden lich key. It will open the door to terrible things. -minotaur key=minotaur key -You see a fancy bronze key. It smells faintly of minotaur, perhaps one dropped it?=You see a fancy bronze key. It smells faintly of minotaur, perhaps one dropped it? -nalwor bank key=nalwor bank key -You see a key to the customer room of Nalwor Bank.=You see a key to the customer room of Nalwor Bank. -kotoch prison key=kotoch prison key -You see an ancient copper key, enscribed with something in Orcish.=You see an ancient copper key, enscribed with something in Orcish. -kanmararn prison key=kanmararn prison key -You see a key which matches the locks in the Kanmararn prison.=You see a key which matches the locks in the Kanmararn prison. -sedah gate key=sedah gate key -You see a key for the gate to the imperial city of Sedah.=You see a key for the gate to the imperial city of Sedah. -pet sanctuary key=pet sanctuary key -You see a key for the pet sanctuary in Ados.=You see a key for the pet sanctuary in Ados. -house key=house key -You should not see this description=You should not see this description -gate key=gate key -You should not see this description=You should not see this description -master key=master key -You see a master key.=You see a master key. -small key=small key -You see the key for Zara's row house in Ados.=You see the key for Zara's row house in Ados. -black legs=black legs -You see a pair of black legs.=You see a pair of black legs. -blue legs=blue legs -You see a pair of shiny new blue legs.=You see a pair of shiny new blue legs. -chain legs=chain legs -You see a pair of well made chain legs. They should protect you against any attacks aimed low.=You see a pair of well made chain legs. They should protect you against any attacks aimed low. -chaos legs=chaos legs -You see a pair of chaos legs. The strange colors confuse you.=You see a pair of chaos legs. The strange colors confuse you. -dwarvish legs=dwarvish legs -You see a pair of dwarvish legs, designed by master craftsmen.=You see a pair of dwarvish legs, designed by master craftsmen. -elvish legs=elvish legs -You see a pair of elvish legs.=You see a pair of elvish legs. -golden legs=golden legs -You see a pair of shining, strong golden legs.=You see a pair of shining, strong golden legs. -jewelled legs=jewelled legs -You see a beautiful pair of jewelled legs. A large red gem glints at you and they're encrusted all over with sapphires.=You see a beautiful pair of jewelled legs. A large red gem glints at you and they're encrusted all over with sapphires. -leather legs=leather legs -You see a pair of leather legs. They look new but they're poor quality.=You see a pair of leather legs. They look new but they're poor quality. -mainio legs=mainio legs -You see a pair of odd looking mainio legs. They are somewhat startling but they give you a good protection.=You see a pair of odd looking mainio legs. They are somewhat startling but they give you a good protection. -mithril legs=mithril legs -You see a pair of mithril legs. They will serve you well.=You see a pair of mithril legs. They will serve you well. -red legs=red legs -A pair of red legs are in your grasp.=A pair of red legs are in your grasp. -shadow legs=shadow legs -You see a pair of shadow legs. The weight of them is incredible.=You see a pair of shadow legs. The weight of them is incredible. -stone legs=stone legs -You see a pair of stone legs, heavy and durable.=You see a pair of stone legs, heavy and durable. -studded legs=studded legs -You see a pair of blood stained studded legs. You're not sure if the blood came from their last owner ... or his enemies.=You see a pair of blood stained studded legs. You're not sure if the blood came from their last owner ... or his enemies. -xeno legs=xeno legs -You see a pair of xeno legs. They're very strong and look brand new.=You see a pair of xeno legs. They're very strong and look brand new. -bulb=bulb -You see a bulb. It can be planted anywhere, but it will only thrive on fertile ground.=You see a bulb. It can be planted anywhere, but it will only thrive on fertile ground. -seed=seed -You see a seed. It can be planted anywhere, but it will only thrive on fertile ground.=You see a seed. It can be planted anywhere, but it will only thrive on fertile ground. -giant heart=giant heart -You see a giant heart. This proves that a giant was defeated, and has magical properties that you are not sure of.=You see a giant heart. This proves that a giant was defeated, and has magical properties that you are not sure of. -dice=dice -You see a set of dice. May lady luck be with you.=You see a set of dice. May lady luck be with you. -cards=cards -You see a deck of cards. Shuffle them well, to get a winning hand.=You see a deck of cards. Shuffle them well, to get a winning hand. -teddy=teddy -You see a teddy bear. Its soft and cuddly, and children love them.=You see a teddy bear. Its soft and cuddly, and children love them. -rodent trap=rodent trap -You see a rodent trap.=You see a rodent trap. -vampirette entrails=vampirette entrails -You see some vampirette entrails. These guts proves that a vampirette was slain.=You see some vampirette entrails. These guts proves that a vampirette was slain. -bat entrails=bat entrails -You see some bat entrails, full of the blood of a living creature.=You see some bat entrails, full of the blood of a living creature. -suntan cream=suntan cream -You see a suntan cream.=You see a suntan cream. -marbles=marbles -You see some marbles. Boys will be boys.=You see some marbles. Boys will be boys. -canned tuna=canned tuna -You see what appears to be canned tuna. Too bad you don't have a can opener.=You see what appears to be canned tuna. Too bad you don't have a can opener. -snowglobe=snowglobe -You see a snowglobe. It's so festive, it reminds you of Christmas!=You see a snowglobe. It's so festive, it reminds you of Christmas! -bobbin=bobbin -You see a bobbin for a sewing machine.=You see a bobbin for a sewing machine. -venom gland=venom gland -You see the venom gland of a giant cobra. It is filled with deadly toxin.=You see the venom gland of a giant cobra. It is filled with deadly toxin. -snowball=snowball -You see snowballs. You can throw them at your friends or put it in your bag to keep your fish fresh. But be careful, there could be little stones in it.=You see snowballs. You can throw them at your friends or put it in your bag to keep your fish fresh. But be careful, there could be little stones in it. -vomit=vomit -You see a pile of vomit. Gross!=You see a pile of vomit. Gross! -shuriken=shuriken -You see a shuriken. You'll need to be close before you can use it as a missile. Stand square on, not diagonally, for the best results.=You see a shuriken. You'll need to be close before you can use it as a missile. Stand square on, not diagonally, for the best results. -fire shuriken=fire shuriken -You see a fire shuriken. Throwing this flaming missile unleashes fiendish power.=You see a fire shuriken. Throwing this flaming missile unleashes fiendish power. -wooden spear=wooden spear -You see a wooden spear. You can attack at a distance with this primitive weapon. Stand square on, not diagonally, for the best results.=You see a wooden spear. You can attack at a distance with this primitive weapon. Stand square on, not diagonally, for the best results. -money=money -You see a money.=You see a money. -wooden bow=wooden bow -You see a wooden bow. With this in one hand, and wooden arrows in the other, you may be able to attack from a distance.=You see a wooden bow. With this in one hand, and wooden arrows in the other, you may be able to attack from a distance. -longbow=longbow -You see a longbow. Equipped with this, and a supply of arrows, you will have an effective ranged attack.=You see a longbow. Equipped with this, and a supply of arrows, you will have an effective ranged attack. -composite bow=composite bow -You see a composite bow. It's better strung than most bows, for excellent ranged attack.=You see a composite bow. It's better strung than most bows, for excellent ranged attack. -crossbow=crossbow -You see a crossbow. The attack is high but it has a very short range, what do you prefer?=You see a crossbow. The attack is high but it has a very short range, what do you prefer? -hunter crossbow=hunter crossbow -You see a hunter crossbow. You must decide if the high attack is worth the short range it has.=You see a hunter crossbow. You must decide if the high attack is worth the short range it has. -mithril bow=mithril bow -You see a light and strong mithril bow. Its impeccable workmanship affords incredible accuracy.=You see a light and strong mithril bow. Its impeccable workmanship affords incredible accuracy. -wood=wood -You see some wood, fallen from a nearby tree.=You see some wood, fallen from a nearby tree. -sugar cane=sugar cane -You see a sugar cane. You can grind it for raw sugar.=You see a sugar cane. You can grind it for raw sugar. -grain=grain -You see a sheaf of grain.=You see a sheaf of grain. -flour=flour -You see a sack of flour.=You see a sack of flour. -iron ore=iron ore -You see a nugget of iron ore.=You see a nugget of iron ore. -coal=coal -You see a black and shiny piece of stone coal. It stayed in the ground for million of years.=You see a black and shiny piece of stone coal. It stayed in the ground for million of years. -wool=wool -You see wool. It was recently shorn.=You see wool. It was recently shorn. -yarn=yarn -You see a ball of yarn. It was spun with care.=You see a ball of yarn. It was spun with care. -cloth=cloth -You see a roll of cloth. It is of first-class quality.=You see a roll of cloth. It is of first-class quality. -gold nugget=gold nugget -You see a gold nugget. Its rich golden color shines, and it may be useful.=You see a gold nugget. Its rich golden color shines, and it may be useful. -mithril nugget=mithril nugget -You see a mithril nugget. Its pale silvery color shines, and it may be useful.=You see a mithril nugget. Its pale silvery color shines, and it may be useful. -iron=iron -You see a piece of iron.=You see a piece of iron. -gold bar=gold bar -You see a gold bar. It will make beautiful jewelry, or fetch a fine price.=You see a gold bar. It will make beautiful jewelry, or fetch a fine price. -mithril bar=mithril bar -You see a mithril bar. It can be made into excellent armor, or fetch a fine price.=You see a mithril bar. It can be made into excellent armor, or fetch a fine price. -golden egg=golden egg -You see a valuable golden egg.=You see a valuable golden egg. -spotted egg=spotted egg -You see a spotted egg. They are said to be delicious.=You see a spotted egg. They are said to be delicious. -reptile egg=reptile egg -You see a valuable reptile egg.=You see a valuable reptile egg. -silk gland=silk gland -You see a silk gland from a giant spider. Its contents are extremely valuable.=You see a silk gland from a giant spider. Its contents are extremely valuable. -silk thread=silk thread -You see a spool of silk thread, spun from the glands of a giant spider..=You see a spool of silk thread, spun from the glands of a giant spider.. -oil=oil -You see a small can of oil.=You see a small can of oil. -mithril thread=mithril thread -You see a spool of mithril thread, made from silk fused with mithril.=You see a spool of mithril thread, made from silk fused with mithril. -mithril fabric=mithril fabric -You see a couple yards of mithril fabric. It's very sparkly!=You see a couple yards of mithril fabric. It's very sparkly! -horse hair=horse hair -You see some horse hairs.=You see some horse hairs. -beeswax=beeswax -You see a piece of beeswax.=You see a piece of beeswax. -candle=candle -You see a candle in a candle stick.=You see a candle in a candle stick. -angel figurine=angel figurine -You see a sparkling angel figurine.=You see a sparkling angel figurine. -skull ring=skull ring -You see a skull ring.=You see a skull ring. -amulet=amulet -You see an amulet.=You see an amulet. -ankh=ankh -You see a mysterious ankh. You don't know what it is for.=You see a mysterious ankh. You don't know what it is for. -wedding ring=wedding ring -You see a golden wedding ring, a symbol of love.=You see a golden wedding ring, a symbol of love. -engagement ring=engagement ring -You see a diamond engagement ring, a symbol of love (or a symbol of wealth?)=You see a diamond engagement ring, a symbol of love (or a symbol of wealth?) -emerald ring=emerald ring -You see an emerald ring, known as ring of life. Wear it, and you risk less from death.=You see an emerald ring, known as ring of life. Wear it, and you risk less from death. -summon scroll=summon scroll -You see a summon scroll.=You see a summon scroll. -nalwor city scroll=nalwor city scroll -You see a nalwor city scroll, it will take you back to nalwor city.=You see a nalwor city scroll, it will take you back to nalwor city. -ados city scroll=ados city scroll -You see a ados city scroll, it will take you back to ados city.=You see a ados city scroll, it will take you back to ados city. -fado city scroll=fado city scroll -You see a fado city scroll, it will take you back to fado city.=You see a fado city scroll, it will take you back to fado city. -kirdneh city scroll=kirdneh city scroll -You see a kirdneh city scroll, it will take you back to kirdneh city.=You see a kirdneh city scroll, it will take you back to kirdneh city. -kalavan city scroll=kalavan city scroll -You see a kalavan city scroll, it will take you back to kalavan city.=You see a kalavan city scroll, it will take you back to kalavan city. -marked scroll=marked scroll -You see a marked scroll.=You see a marked scroll. -invitation scroll=invitation scroll -You see an invitation scroll.=You see an invitation scroll. -home scroll=home scroll -You see a home scroll, it will take you back to semos city.=You see a home scroll, it will take you back to semos city. -empty scroll=empty scroll -You see an empty scroll. If used correctly it will return you to where you marked it at.=You see an empty scroll. If used correctly it will return you to where you marked it at. -rainbow beans=rainbow beans -You see a small pile of rainbow beans. One says something odd.=You see a small pile of rainbow beans. One says something odd. -balloon=balloon -You see a bright red balloon. You can use it to float high up into the clouds.=You see a bright red balloon. You can use it to float high up into the clouds. -twilight moss=twilight moss -You see a strange looking piece of moss. It looks like it could have hallucinogenic properties.=You see a strange looking piece of moss. It looks like it could have hallucinogenic properties. -lucky charm=lucky charm -You see a lucky charm. Some believe that it helps their karma in some way, but others think that is superstition.=You see a lucky charm. Some believe that it helps their karma in some way, but others think that is superstition. -mithril clasp=mithril clasp -You see a clasp made from mithril, it would provide the fastening for a cloak.=You see a clasp made from mithril, it would provide the fastening for a cloak. -mythical egg=mythical egg -You see a mythical egg, but you do not know, what it is for.=You see a mythical egg, but you do not know, what it is for. -magical eggshells=magical eggshells -You see shards from a mythical egg. They have magical properties.=You see shards from a mythical egg. They have magical properties. -golden gm token=golden gm token -You see a golden gm token.=You see a golden gm token. -silvery gm token=silvery gm token -You see a silvery gm token.=You see a silvery gm token. -bronze gm token=bronze gm token -You see a bronze gm token.=You see a bronze gm token. -black shield=black shield -You see a black shield. Its darkness will surely protect you.=You see a black shield. Its darkness will surely protect you. -blue shield=blue shield -You see a blue shield. It feels light in your hand but is strong enough for excellent protection.=You see a blue shield. It feels light in your hand but is strong enough for excellent protection. -buckler=buckler -You see a small buckler. It may protect you against swords and maces but against stronger weapons you do not trust it.=You see a small buckler. It may protect you against swords and maces but against stronger weapons you do not trust it. -chaos shield=chaos shield -You see a chaos shield. Its charming appearance will fool your enemies.=You see a chaos shield. Its charming appearance will fool your enemies. -crown shield=crown shield -You see a mighty crown shield. It is in perfect condition.=You see a mighty crown shield. It is in perfect condition. -elvish shield=elvish shield -You see an elvish shield. It looks like one big tree leaf!=You see an elvish shield. It looks like one big tree leaf! -enhanced lion shield=enhanced lion shield -An enhanced lion shield glints at you. It will defend you well.=An enhanced lion shield glints at you. It will defend you well. -golden shield=golden shield -You see a golden shield, could it be the ultimate in defense?=You see a golden shield, could it be the ultimate in defense? -green dragon shield=green dragon shield -You see an green dragon shield, scaly and strong.=You see an green dragon shield, scaly and strong. -lion shield=lion shield -You see a valuable lion shield. It is heavy enough to defend you against strong attacks.=You see a valuable lion shield. It is heavy enough to defend you against strong attacks. -magic plate shield=magic plate shield -You see a magic plate shield. It has a magical quality surrounding it.=You see a magic plate shield. It has a magical quality surrounding it. -mainio shield=mainio shield -You see a strange looking mainio shield. You have no idea what it's made of, but it seems to protect you well by distracting your enemies.=You see a strange looking mainio shield. You have no idea what it's made of, but it seems to protect you well by distracting your enemies. -mithril shield=mithril shield -You see a mithril shield. You will most surely be protected.=You see a mithril shield. You will most surely be protected. -plate shield=plate shield -You see a solid plate shield. It is in good condition, and might be worth a little.=You see a solid plate shield. It is in good condition, and might be worth a little. -red shield=red shield -You see a red shield. It is a stunning shade of scarlet.=You see a red shield. It is a stunning shade of scarlet. -shadow shield=shadow shield -You see a shadow shield. Rather than reflecting light, it seems to absorb it.=You see a shadow shield. Rather than reflecting light, it seems to absorb it. -skull shield=skull shield -The face of a skull scowls at you from this fearsome skull shield.=The face of a skull scowls at you from this fearsome skull shield. -studded shield=studded shield -You see a studded shield. It's a little dented but seems robust enough.=You see a studded shield. It's a little dented but seems robust enough. -unicorn shield=unicorn shield -You see a unicorn shield. It's beautifully crafted and will give you excellent protection.=You see a unicorn shield. It's beautifully crafted and will give you excellent protection. -wooden shield=wooden shield -You see a wooden shield. It is made of cheap wood and heavily used. However, it still seems to offer you some kind of basic protection.=You see a wooden shield. It is made of cheap wood and heavily used. However, it still seems to offer you some kind of basic protection. -xeno shield=xeno shield -You see a lightweight but strong xeno shield, in the colors of the creature it was looted from.=You see a lightweight but strong xeno shield, in the colors of the creature it was looted from. -assassin dagger=assassin dagger -You see an assassin dagger, easy to pull out and use when needed.=You see an assassin dagger, easy to pull out and use when needed. -biting sword=biting sword -The point of this biting sword is chiseled to a lethal point. It will serve you well.=The point of this biting sword is chiseled to a lethal point. It will serve you well. -black sword=black sword -You see a black sword. Its darkness will surely protect you.=You see a black sword. Its darkness will surely protect you. -broadsword=broadsword -You see a mighty broadsword. Enemies will see their death.=You see a mighty broadsword. Enemies will see their death. -buster=buster -You see a buster, with its distinctive, oversized blade.=You see a buster, with its distinctive, oversized blade. -chaos dagger=chaos dagger -You see a chaos dagger, it is very lightweight and sharp. It will heal you while hurting them.=You see a chaos dagger, it is very lightweight and sharp. It will heal you while hurting them. -chaos sword=chaos sword -The chaos sword. It hurts them but it heals you.=The chaos sword. It hurts them but it heals you. -claymore=claymore -This claymore is very hard to lift as it is so heavy. It will be a good weapon if you can swing it.=This claymore is very hard to lift as it is so heavy. It will be a good weapon if you can swing it. -dagger=dagger -You see a dagger, it is little more than decorative but you can jab pretty fast with it.=You see a dagger, it is little more than decorative but you can jab pretty fast with it. -dark dagger=dark dagger -You see a dark dagger. It's designed to be used with a fast motion.=You see a dark dagger. It's designed to be used with a fast motion. -demon fire sword=demon fire sword -The demon fire sword, a horrible sword taken from hell's deepest dungeons.=The demon fire sword, a horrible sword taken from hell's deepest dungeons. -demon sword=demon sword -Demon skeletons return from hell with this demon sword.=Demon skeletons return from hell with this demon sword. -drow sword=drow sword -This is a genuine drow sword.=This is a genuine drow sword. -elvish sword=elvish sword -This is an elvish sword. It looks like it is made from tree leaves!=This is an elvish sword. It looks like it is made from tree leaves! -fire sword=fire sword -Flames race along this fire sword as you wield it.=Flames race along this fire sword as you wield it. -golden blade=golden blade -You see the rare and precious golden blade. It can steal life from those you stab with it.=You see the rare and precious golden blade. It can steal life from those you stab with it. -golden orc sword=golden orc sword -You see a golden orc sword, with its heavy and deadly appearance it seems also valuable.=You see a golden orc sword, with its heavy and deadly appearance it seems also valuable. -great sword=great sword -This rare great sword is heavy and of good craftsmanship. It can only attack incredibly slowly.=This rare great sword is heavy and of good craftsmanship. It can only attack incredibly slowly. -hell dagger=hell dagger -You see a hell dagger. Is the color that of the burning fires of Hell?=You see a hell dagger. Is the color that of the burning fires of Hell? -ice sword=ice sword -You see an ice sword, the blade is lethally cold to the touch, and you know it is one of the best weapons you'll find.=You see an ice sword, the blade is lethally cold to the touch, and you know it is one of the best weapons you'll find. -imperator sword=imperator sword -You see a an imperator sword, crafted from you know not what.=You see a an imperator sword, crafted from you know not what. -immortal sword=immortal sword -This immortal sword is a gift of gods to the chosen one. It is heavy and of exquisite craftsmanship.=This immortal sword is a gift of gods to the chosen one. It is heavy and of exquisite craftsmanship. -katana=katana -You see a valuable katana, with a lethal looking blade.=You see a valuable katana, with a lethal looking blade. -knife=knife -You see a blunt knife which looks capable of little damage.=You see a blunt knife which looks capable of little damage. -l hand sword=l hand sword -You see l hand sword. It must be used with right hand sword.=You see l hand sword. It must be used with right hand sword. -night dagger=night dagger -You see a night dagger, to be used with stealth.=You see a night dagger, to be used with stealth. -nihonto=nihonto -You see a samurai's nihonto sword with a razor sharp blade.=You see a samurai's nihonto sword with a razor sharp blade. -obsidian knife=obsidian knife -You see a knife whose blade is crafted to a lethal edge from finest obsidian.=You see a knife whose blade is crafted to a lethal edge from finest obsidian. -orc sword=orc sword -You see an orc sword which has a heavy and deadly appearance.=You see an orc sword which has a heavy and deadly appearance. -orcish sword=orcish sword -This orcish sword is badly done and weighs a lot.=This orcish sword is badly done and weighs a lot. -r hand sword=r hand sword -You see r hand sword. It must be used with a left hand sword.=You see r hand sword. It must be used with a left hand sword. -scimitar=scimitar -This scimitar catches the light as you look at it, it will be a powerful weapon.=This scimitar catches the light as you look at it, it will be a powerful weapon. -short sword=short sword -You see a well kept short sword which will be easy to carry as you travel.=You see a well kept short sword which will be easy to carry as you travel. -soul dagger=soul dagger -You see a soul dagger. It's so light and sharp that you can stab at a very fast rate.=You see a soul dagger. It's so light and sharp that you can stab at a very fast rate. -sword=sword -You see a sharp sword which might even be worth a little.=You see a sharp sword which might even be worth a little. -vampire sword=vampire sword -You see the vampire sword, which will suck life from those you attack with it.=You see the vampire sword, which will suck life from those you attack with it. -xeno sword=xeno sword -You wield a xeno sword. Despite the great strength it is strangely light.=You wield a xeno sword. Despite the great strength it is strangely light. -arrow game token=arrow game token -You see a token, that when placed in the right spot could point you in the right direction.=You see a token, that when placed in the right spot could point you in the right direction. -o board token=o board token -You see an O token.=You see an O token. -x board token=x board token -You see an X token.=You see an X token. -food mill=food mill -You see a food mill. It is the traditional tool to mill food.=You see a food mill. It is the traditional tool to mill food. -sugar mill=sugar mill -You see a sugar mill. You can obtain sugar if you grind canes with it.=You see a sugar mill. You can obtain sugar if you grind canes with it. -scroll eraser=scroll eraser -You see a scroll eraser. Put a marked scroll in the opposite hand to clean the scroll.=You see a scroll eraser. Put a marked scroll in the opposite hand to clean the scroll. -pestle and mortar=pestle and mortar -You see a pestle and mortar. This is the traditional tool to pound herbs, food and other substances.=You see a pestle and mortar. This is the traditional tool to pound herbs, food and other substances. -gold pan=gold pan -You see a gold pan. It is the traditional tool to prospect for gold.=You see a gold pan. It is the traditional tool to prospect for gold. -fishing rod=fishing rod -You see a fishing rod. If you find a fishing spot you can catch fish with it.=You see a fishing rod. If you find a fishing spot you can catch fish with it. -magical scissors=magical scissors -You see a sparkling pair of magical scissors. Just think what they could cut!=You see a sparkling pair of magical scissors. Just think what they could cut! -magical needle=magical needle -You see a magical needle with a very sharp point.=You see a magical needle with a very sharp point. -pick=pick -You see a pick. It is a tool which helps you to get some coal.=You see a pick. It is a tool which helps you to get some coal. -shovel=shovel -You see a shovel, a tool for digging.=You see a shovel, a tool for digging. -dark angel=dark angel -You see a dark angel. He is an strong evil angel, and for now he is under cover of darkness.=You see a dark angel. He is an strong evil angel, and for now he is under cover of darkness. -My will be done over land and sky!=My will be done over land and sky! -Mine is the Power and the Glory!=Mine is the Power and the Glory! -dark archangel=dark archangel -You see a dark archangel. After she fell from heaven her soul became as dark as she is now.=You see a dark archangel. After she fell from heaven her soul became as dark as she is now. -I will strike you down with more power than you can imagine!!=I will strike you down with more power than you can imagine!! -My will be done!=My will be done! -fallen angel=fallen angel -You see a fallen angel. When he turned away from good, he fell down from heaven.=You see a fallen angel. When he turned away from good, he fell down from heaven. -You are DOOMED.=You are DOOMED. -I am here to destroy all people.=I am here to destroy all people. -baby angel=baby angel -You see a baby angel. Will it ever get a chance to grow up?=You see a baby angel. Will it ever get a chance to grow up? -I want to grow to be mighty!=I want to grow to be mighty! -angel=angel -You see an angel. With his flame sword he guards the way and doesn't let you pass.=You see an angel. With his flame sword he guards the way and doesn't let you pass. -Meet thy maker!=Meet thy maker! -Mere mortals cannot challenge me!=Mere mortals cannot challenge me! -archangel=archangel -You see an archangel. She wants to kill you because she doesn't want you in the clouds.=You see an archangel. She wants to kill you because she doesn't want you in the clouds. -Neither the earth nor the sky has a place for you...=Neither the earth nor the sky has a place for you... -Leave now, before it is too late for you.=Leave now, before it is too late for you. -Your destiny is not here.=Your destiny is not here. -spider=spider -You see a spider. It makes a giant spider web to trap you!=You see a spider. It makes a giant spider web to trap you! -poisonous spider=poisonous spider -You see a poisonous spider. Be careful! Its poison is very strong! It will make you very weak and can probably kill you!=You see a poisonous spider. Be careful! Its poison is very strong! It will make you very weak and can probably kill you! -giant spider=giant spider -You see a giant spider. It has very long legs which are quite dangerous.=You see a giant spider. It has very long legs which are quite dangerous. -crab=crab -You see a little crab that comes from the beach, be careful of its pincers.=You see a little crab that comes from the beach, be careful of its pincers. -click-clack-click=click-clack-click -chick=chick -You see a little chick, it doesn't like to be away from its mother.=You see a little chick, it doesn't like to be away from its mother. -peep peep=peep peep -peep peep peep=peep peep peep -chicken=chicken -You see a chicken, isn't it nice?=You see a chicken, isn't it nice? -cluck cluck=cluck cluck -cluck cluck cluck=cluck cluck cluck -mother hen=mother hen -You see a mother hen, she will probably hurt you if you touch her sons.=You see a mother hen, she will probably hurt you if you touch her sons. -peep peep=peep peep -peep peep peep=peep peep peep -penguin=penguin -You see a penguin, smart and silly.=You see a penguin, smart and silly. -Oou! Oou!=Oou! Oou! -*flap* *flap*=*flap* *flap* -pigeon=pigeon -You see a pigeon, it loves the little seeds.=You see a pigeon, it loves the little seeds. -killer bee=killer bee -You see a killer bee which will sting you to death!=You see a killer bee which will sting you to death! -BbzzZZzzz!=BbzzZZzzz! -deer=deer -You see a defenseless deer, do not have fear of it.=You see a defenseless deer, do not have fear of it. -mouse=mouse -You see a small mouse that seems to be very hungry.=You see a small mouse that seems to be very hungry. -squeak ... squeak!=squeak ... squeak! -rat=rat -You see a small rat that seems to be extremely hungry.=You see a small rat that seems to be extremely hungry. -Squeak! Squeak!=Squeak! Squeak! -bat=bat -You see a bat, it will seek your blood, don't be distracted...=You see a bat, it will seek your blood, don't be distracted... -caverat=caverat -You see a caverat which is dirty and loves the dungeons.=You see a caverat which is dirty and loves the dungeons. -piglet=piglet -You see a piglet, a bit dirty.=You see a piglet, a bit dirty. -shnuffle=shnuffle -oink oink=oink oink -oink=oink -babybear=babybear -You see a babybear, isn't it sweet?=You see a babybear, isn't it sweet? -Roar!=Roar! -beaver=beaver -You see a beaver. It likes to build dams in the river.=You see a beaver. It likes to build dams in the river. -big bad wolf=big bad wolf -You see a big bad wolf. It is really wild, hungry and really dangerous!=You see a big bad wolf. It is really wild, hungry and really dangerous! -Aooooooouuhhh!!=Aooooooouuhhh!! -boar=boar -You see a boar, they are pretty wild!=You see a boar, they are pretty wild! -Oink!!=Oink!! -bull=bull -You see a bull, run away!!!=You see a bull, run away!!! -MOOOOO!!!=MOOOOO!!! -cow=cow -You see a cow, taste her delicious milk.=You see a cow, taste her delicious milk. -mooooo=mooooo -Moooo moooo mooooooo=Moooo moooo mooooooo -fox=fox -You see a fox, it becomes extinct!=You see a fox, it becomes extinct! -goat=goat -You see a goat, which is wild and lives in the mountain.=You see a goat, which is wild and lives in the mountain. -horse=horse -You see a horse, don't slap it or it will run away!=You see a horse, don't slap it or it will run away! -neigghhh neigghhh=neigghhh neigghhh -monkey=monkey -You see a monkey, would you like to offer it a banana?=You see a monkey, would you like to offer it a banana? -Aooooooouuhhh!!=Aooooooouuhhh!! -panda=panda -You see a panda which comes from an exotic land.=You see a panda which comes from an exotic land. -Roar!=Roar! -ram=ram -You see a ram, maybe you are able to shear it?=You see a ram, maybe you are able to shear it? -Baaaaaa=Baaaaaa -white horse=white horse -You see a white horse, they love to stay with their brown friends.=You see a white horse, they love to stay with their brown friends. -naayyy=naayyy -wolf=wolf -You see a wolf. It is wild and very hungry!=You see a wolf. It is wild and very hungry! -Aooooooouuhhh!!=Aooooooouuhhh!! -bear=bear -You see a bear. You are lucky and found it awake.=You see a bear. You are lucky and found it awake. -Roar!=Roar! -lion=lion -You see a lion, dangerous and hungry...=You see a lion, dangerous and hungry... -Grooooaaaarrrr!=Grooooaaaarrrr! -elephant=elephant -You see an elephant, a huge animal with lots of ham and meat. Are you sure that you want to attack it?=You see an elephant, a huge animal with lots of ham and meat. Are you sure that you want to attack it? -WHOOOOEOEOEZZZZZZ!!!=WHOOOOEOEOEZZZZZZ!!! -tiger=tiger -You see a tiger, which likes deer and human meat.=You see a tiger, which likes deer and human meat. -Miiiiaaauuu!=Miiiiaaauuu! -venomrat=venomrat -You see a venomrat, extremely poisonous.=You see a venomrat, extremely poisonous. -killer bat=killer bat -You see a killer bat which will suck your blood!=You see a killer bat which will suck your blood! -black bear=black bear -You see a strong black bear which hibernates in winter.=You see a strong black bear which hibernates in winter. -ROOOOAAAAR!=ROOOOAAAAR! -razorrat=razorrat -You see a razorrat, its noise will make you crazy!=You see a razorrat, its noise will make you crazy! -giantrat=giantrat -You see a giant rat. It seems like it survived from an experiment which went wrong.=You see a giant rat. It seems like it survived from an experiment which went wrong. -unicorn=unicorn -You see a rare unicorn. It is widely believed to be only a myth.=You see a rare unicorn. It is widely believed to be only a myth. -centaur=centaur -You see a noble centaur, half man, half horse. He looks capable of great damage but thankfully seems to mean you no harm.=You see a noble centaur, half man, half horse. He looks capable of great damage but thankfully seems to mean you no harm. -pegasus=pegasus -You see Pegasus, the winged horse. His name means Lightning and he carries bolts of Thunder.=You see Pegasus, the winged horse. His name means Lightning and he carries bolts of Thunder. -caiman=caiman -You see a caiman, which is hidden in the water.=You see a caiman, which is hidden in the water. -Grrr Grrr!=Grrr Grrr! -grass snake=grass snake -You see a grass snake which is quite dangerous.=You see a grass snake which is quite dangerous. -sssSSSsssss...=sssSSSsssss... -snake=snake -You see a snake, it came from the forest to poison you!=You see a snake, it came from the forest to poison you! -SsSssSsssssss!=SsSssSsssssss! -crocodile=crocodile -You see a crocodile, it arises from the deep waters in the rivers.=You see a crocodile, it arises from the deep waters in the rivers. -Rrrrrrrrr=Rrrrrrrrr -cobra=cobra -You see a cobra.=You see a cobra. -king cobra=king cobra -You see a king cobra. It is extremely venomous.=You see a king cobra. It is extremely venomous. -young beholder=young beholder -You see a young beholder. His huge eye will find you everywhere!=You see a young beholder. His huge eye will find you everywhere! -Defend yourself! I can see you!=Defend yourself! I can see you! -beholder=beholder -You see a beholder which can see you very well with his huge eye...=You see a beholder which can see you very well with his huge eye... -elder beholder=elder beholder -You see an elder beholder, his nasty eye will scare you.=You see an elder beholder, his nasty eye will scare you. -gargoyle=gargoyle -You see a gargoyle, You should think that it is a statue, but no, it is alive!=You see a gargoyle, You should think that it is a statue, but no, it is alive! -elder gargoyle=elder gargoyle -You see an elder gargoyle, it is wise...=You see an elder gargoyle, it is wise... -dark gargoyle=dark gargoyle -You see a dark gargoyle, do you feel the fear?=You see a dark gargoyle, do you feel the fear? -venom gargoyle=venom gargoyle -You see a venom gargoyle, a hideous and poisonous creature.=You see a venom gargoyle, a hideous and poisonous creature. -mimic=mimic -You see a mimic. Its content might be different from what you expect.=You see a mimic. Its content might be different from what you expect. -snarfkin=snarfkin -You see a snarfkin, the favorite pet of wizards. Be careful, its claws are poisonous!=You see a snarfkin, the favorite pet of wizards. Be careful, its claws are poisonous! -glow monster=glow monster -You see a glow monster.=You see a glow monster. -dark mutant=dark mutant -You see a dark mutant.=You see a dark mutant. -googon=googon -You see a googon that comes from the worst place in this world...Be careful this creature is a deadly killer.=You see a googon that comes from the worst place in this world...Be careful this creature is a deadly killer. -grobble monster=grobble monster -You see a grobble monster.=You see a grobble monster. -grobble grubble grobble=grobble grubble grobble -gribble grobble grubble=gribble grobble grubble -winged blurble=winged blurble -You see a winged blurble.=You see a winged blurble. -imperial experiment=imperial experiment -You see an imperial experiment which mirrors the fate of many of science departments test subjects. It's skin glows and standing before it taxes your body.=You see an imperial experiment which mirrors the fate of many of science departments test subjects. It's skin glows and standing before it taxes your body. -imperial mutant=imperial mutant -You see an imperial mutant.=You see an imperial mutant. -Ouurgghh!=Ouurgghh! -thing=thing -You see a thing. It looks like a very mutated human and is so scary that you think it has to come from another world.=You see a thing. It looks like a very mutated human and is so scary that you think it has to come from another world. -green slime=green slime -You see a green slime, sticky and shiny.=You see a green slime, sticky and shiny. -brown slime=brown slime -You see a brown slime, sticky and hungry.=You see a brown slime, sticky and hungry. -black slime=black slime -You see a black slime, with a sticky trail behind it.=You see a black slime, with a sticky trail behind it. -twilight slime=twilight slime -You see a twilight slime, so strange and beautiful. Why is it coming towards you? Runnnnnnnnn!=You see a twilight slime, so strange and beautiful. Why is it coming towards you? Runnnnnnnnn! -violet avenger=violet avenger -You see a violet avenger.=You see a violet avenger. -devil queen=devil queen -You see a devil queen.=You see a devil queen. -Who wakes me from my meditation?=Who wakes me from my meditation? -You will regret this!=You will regret this! -demon=demon -You see a demon. He personifies evil.=You see a demon. He personifies evil. -imperial demon servant=imperial demon servant -You see an imperial demon servant who carries out whims of his demon lords.=You see an imperial demon servant who carries out whims of his demon lords. -imperial demon lord=imperial demon lord -You see an imperial demon lord. He holds the rank of General among demons, and very few out rank it in hell.=You see an imperial demon lord. He holds the rank of General among demons, and very few out rank it in hell. -balrog=balrog -You see a huge balrog. He is slow hitting, but terribly strong as he stands towering above you.=You see a huge balrog. He is slow hitting, but terribly strong as he stands towering above you. -Arrrrllllggggghhhh=Arrrrllllggggghhhh -Growwwwwwwrrrrrrr!=Growwwwwwwrrrrrrr! -imp=imp -You see an imp. He may look a little bit cute, but don't forget he is one of the devil's servants!=You see an imp. He may look a little bit cute, but don't forget he is one of the devil's servants! -winged blue imp=winged blue imp -You see a winged blue imp. It's endowed with the power of evil. His trident is able to poison even the bravest warriors.=You see a winged blue imp. It's endowed with the power of evil. His trident is able to poison even the bravest warriors. -chaos green dragonrider=chaos green dragonrider -You see a chaos green dragonrider. Don't misjudge him as to believe it's a normal green dragon, as it is controlled by a mysterious sorcerer seated on his back.=You see a chaos green dragonrider. Don't misjudge him as to believe it's a normal green dragon, as it is controlled by a mysterious sorcerer seated on his back. -Wheee!!=Wheee!! -It's fun up here!=It's fun up here! -chaos red dragonrider=chaos red dragonrider -You see a chaos red dragonrider. He might look like a red dragon, but the sorcerer seated on his back guides him to give even more strength out.=You see a chaos red dragonrider. He might look like a red dragon, but the sorcerer seated on his back guides him to give even more strength out. -Charrrrrrrrge!=Charrrrrrrrge! -green dragon=green dragon -You see a green dragon. His wings may be too small for him to fly with them but nevertheless he looks very strong and his thick green skin seems to protect him quite well.=You see a green dragon. His wings may be too small for him to fly with them but nevertheless he looks very strong and his thick green skin seems to protect him quite well. -bone dragon=bone dragon -You see a bone dragon. It's been said that there are creatures with enough will to live that their souls still cling to life even as their flesh and blood has failed them. This is living proof.=You see a bone dragon. It's been said that there are creatures with enough will to live that their souls still cling to life even as their flesh and blood has failed them. This is living proof. -blue dragon=blue dragon -You see a blue dragon. It has a very beautiful blue skin which shimmers mysteriously in the light. But don't forget that it also has claws and teeth!=You see a blue dragon. It has a very beautiful blue skin which shimmers mysteriously in the light. But don't forget that it also has claws and teeth! -red dragon=red dragon -You see into the emerald eyes of a red dragon. With these it can spot prey in the darkness. It's red scales serve it well, reflecting any light that shines on them blinding enemies. The scales are prized for their beauty, and difficult to obtain from such a ferocious beast.=You see into the emerald eyes of a red dragon. With these it can spot prey in the darkness. It's red scales serve it well, reflecting any light that shines on them blinding enemies. The scales are prized for their beauty, and difficult to obtain from such a ferocious beast. -black dragon=black dragon -You see a black dragon. As you see this huge black creature you almost faint! If you concentrate you can feel the deep growling of it in your bones.=You see a black dragon. As you see this huge black creature you almost faint! If you concentrate you can feel the deep growling of it in your bones. -flying golden dragon=flying golden dragon -You see a flying golden dragon. As it spreads its mighty wings you shiver... this mystical creature seems to have much power in it!=You see a flying golden dragon. As it spreads its mighty wings you shiver... this mystical creature seems to have much power in it! -twin headed dragon=twin headed dragon -You see a twin headed dragon. The two heads are staring at you with their four eyes!=You see a twin headed dragon. The two heads are staring at you with their four eyes! -duergar=duergar -You see a duergar. It is a close relative to dwarves but with a diabolically tainted blood.=You see a duergar. It is a close relative to dwarves but with a diabolically tainted blood. -duergar axeman=duergar axeman -You see a duergar axeman.=You see a duergar axeman. -elder duergar=elder duergar -You see an elder duergar.=You see an elder duergar. -duergar elite=duergar elite -You see a duergar elite.=You see a duergar elite. -duergar hero=duergar hero -You see a duergar hero.=You see a duergar hero. -We mighty duergars will crush the dwarves!=We mighty duergars will crush the dwarves! -duergar wizard=duergar wizard -You see a duergar wizard.=You see a duergar wizard. -black duergar=black duergar -You see a black duergar.=You see a black duergar. -Dwarves are the enemy ... but we kill all who cross our path!=Dwarves are the enemy ... but we kill all who cross our path! -duergar king=duergar king -You see a duergar king.=You see a duergar king. -dwarf=dwarf -You see a dwarf who works in the mine to find some iron for us.=You see a dwarf who works in the mine to find some iron for us. -dwarf guardian=dwarf guardian -You see a dwarf guardian who fights against the humans.=You see a dwarf guardian who fights against the humans. -elder dwarf=elder dwarf -You see an elder dwarf, a mighty warrior tired of fighting.=You see an elder dwarf, a mighty warrior tired of fighting. -hero dwarf=hero dwarf -You see a hero dwarf. He is an old dwarf warrior who became a hero for fighting in many dwarf wars and he is very famous for his strength and brutality.=You see a hero dwarf. He is an old dwarf warrior who became a hero for fighting in many dwarf wars and he is very famous for his strength and brutality. -leader dwarf=leader dwarf -You see a leader dwarf. He is the most mighty dwarf of his tribe so he enjoys much popularity there.=You see a leader dwarf. He is the most mighty dwarf of his tribe so he enjoys much popularity there. -giant dwarf=giant dwarf -You see a giant dwarf. It is very hard for him to be a giant dwarf because some of the other dwarves don't really see him as one of them because of his height... But in his big heart he is a dwarf and in a battle he will fight against each enemy!=You see a giant dwarf. It is very hard for him to be a giant dwarf because some of the other dwarves don't really see him as one of them because of his height... But in his big heart he is a dwarf and in a battle he will fight against each enemy! -Dhohr Nuggetcutter=Dhohr Nuggetcutter -You see a dhohr nuggetcutter.=You see a dhohr nuggetcutter. -Lord Durin=Lord Durin -You see the mighty Lord Durin, an ancient dwarf who has led his race through countless battles.=You see the mighty Lord Durin, an ancient dwarf who has led his race through countless battles. -Don't call me Friend.=Don't call me Friend. -mountain dwarf=mountain dwarf -You see a mountain dwarf. He likes earth, stones and rocks. Deep within the mountain, where no animal and no human has ever been, you can hear the sound of his pickaxe as he searches for gold and ore.=You see a mountain dwarf. He likes earth, stones and rocks. Deep within the mountain, where no animal and no human has ever been, you can hear the sound of his pickaxe as he searches for gold and ore. -mountain dwarf guardian=mountain dwarf guardian -You see a mountain dwarf guardian. He has to watch out for enemies and guards the mountain dwarfs while they are doing their work.=You see a mountain dwarf guardian. He has to watch out for enemies and guards the mountain dwarfs while they are doing their work. -mountain elder dwarf=mountain elder dwarf -You see a mountain elder dwarf. For many years he worked deep in the mountain and found much gold and ore in his life. Soon he will be too old to do this work but at the moment he is still a strong dwarf.=You see a mountain elder dwarf. For many years he worked deep in the mountain and found much gold and ore in his life. Soon he will be too old to do this work but at the moment he is still a strong dwarf. -mountain hero dwarf=mountain hero dwarf -You see a mountain hero dwarf. Many, many dwarves admire him! He was a member of a dwarvish group which discovered a very big gold deposit!=You see a mountain hero dwarf. Many, many dwarves admire him! He was a member of a dwarvish group which discovered a very big gold deposit! -mountain leader dwarf=mountain leader dwarf -You see a mountain leader dwarf. He is responsible for the mountain dwarves and their work, and also for the organization of the guardian troops. But in serious cases he will also fight on his own!=You see a mountain leader dwarf. He is responsible for the mountain dwarves and their work, and also for the organization of the guardian troops. But in serious cases he will also fight on his own! -air elemental=air elemental -You see an air elemental and feel a fresh breeze past you.=You see an air elemental and feel a fresh breeze past you. -djinn=djinn -You see a djinn. He isn't caught in a bottle or lamp so someone must have let him free and gave him the order to kill you.=You see a djinn. He isn't caught in a bottle or lamp so someone must have let him free and gave him the order to kill you. -nymph=nymph -You see a nymph. She loves nature very much! As you take a look at her she feels disturbed in sun-bathing and talking to the birds, perhaps she was best left alone.=You see a nymph. She loves nature very much! As you take a look at her she feels disturbed in sun-bathing and talking to the birds, perhaps she was best left alone. -earth elemental=earth elemental -You see an earth elemental. The earth is quaking as it moves over the surface.=You see an earth elemental. The earth is quaking as it moves over the surface. -fire elemental=fire elemental -You see a fire elemental and hardly can stand the heat.=You see a fire elemental and hardly can stand the heat. -ice elemental=ice elemental -You see an ice elemental and sense a shiver on your spine.=You see an ice elemental and sense a shiver on your spine. -ice golem=ice golem -You see an Ice golem. Ice Golems are elementals made out of ice. You should watch out for its icy fists or you might get hurt.=You see an Ice golem. Ice Golems are elementals made out of ice. You should watch out for its icy fists or you might get hurt. -ice giant=ice giant -You see an ice giant. His skin is covered with frozen hoarfrost and his breath feels like the cold north wind.=You see an ice giant. His skin is covered with frozen hoarfrost and his breath feels like the cold north wind. -stone golem=stone golem -You see a stone golem, it only exists to protect. What was it crafted for to protect, and what would one do if it lost its purpose?=You see a stone golem, it only exists to protect. What was it crafted for to protect, and what would one do if it lost its purpose? -dwarf golem=dwarf golem -You see a dwarf golem. A long time ago a dwarf got turned into a big rock by some mystical forces. To save their friend the other dwarves created a golem out of this rock! From this day the dwarf golem lives together with them.=You see a dwarf golem. A long time ago a dwarf got turned into a big rock by some mystical forces. To save their friend the other dwarves created a golem out of this rock! From this day the dwarf golem lives together with them. -water elemental=water elemental -You see a Water elemental which is made of water and various other liquids.=You see a Water elemental which is made of water and various other liquids. -wooden golem=wooden golem -You see a wooden golem. The scroll with ancient words in his head keeps it walking.=You see a wooden golem. The scroll with ancient words in his head keeps it walking. -ent=ent -You see an ent. First you think it is a tree but you will get a surprise when it starts to walk!=You see an ent. First you think it is a tree but you will get a surprise when it starts to walk! -old ent=old ent -You see an old ent. It has seen many years passing by and survived a lot of storms. You can see that it is very old because it has already lost all of its leaves and most of its bark is broken...=You see an old ent. It has seen many years passing by and survived a lot of storms. You can see that it is very old because it has already lost all of its leaves and most of its bark is broken... -entwife=entwife -You see an entwife. It is stronger than an ent and lives in a group in an ancient forest.=You see an entwife. It is stronger than an ent and lives in a group in an ancient forest. -albino elf swordsman=albino elf swordsman -You see an albino elf swordsman who is a professional in using swords. He can attack you from behind in a blink of an eye.=You see an albino elf swordsman who is a professional in using swords. He can attack you from behind in a blink of an eye. -albino elf archer=albino elf archer -You see an albino elf archer. He is so sharp-eyed that he could hit a bee from a distance of 100 meters.=You see an albino elf archer. He is so sharp-eyed that he could hit a bee from a distance of 100 meters. -albino elf magician=albino elf magician -You see an albino elf magician. He knows all the secrets of magic. You'd be better to not let him unleash his full power!=You see an albino elf magician. He knows all the secrets of magic. You'd be better to not let him unleash his full power! -albino elf queen=albino elf queen -You see an albino elf queen. She is the matriarch of the albino elf race and she will do everything to protect it.=You see an albino elf queen. She is the matriarch of the albino elf race and she will do everything to protect it. -albino elf king=albino elf king -You see an albino elf king. He is the patriarch of albino elves and won countless of battles with his powerful albino elf army.=You see an albino elf king. He is the patriarch of albino elves and won countless of battles with his powerful albino elf army. -child dark elf=child dark elf -You see a child dark elf. You should know that dark elves are already quite strong and intelligent when they are children. Don't think you can fight him so easily!=You see a child dark elf. You should know that dark elves are already quite strong and intelligent when they are children. Don't think you can fight him so easily! -dark elf archer=dark elf archer -You see a dark elf archer. Dark elf archer's flawless aim can be fatal for those who dare to oppose them.=You see a dark elf archer. Dark elf archer's flawless aim can be fatal for those who dare to oppose them. -dark elf=dark elf -You see a dark elf.=You see a dark elf. -dark elf elite archer=dark elf elite archer -You see a dark elf elite archer.=You see a dark elf elite archer. -dark elf captain=dark elf captain -You see a dark elf captain.=You see a dark elf captain. -Think not to defy the dark elves!=Think not to defy the dark elves! -dark elf knight=dark elf knight -You see a dark elf knight.=You see a dark elf knight. -dark elf general=dark elf general -You see a Dark Elf General. It is commanding the evil troops of Nalwor Caves against intruders.=You see a Dark Elf General. It is commanding the evil troops of Nalwor Caves against intruders. -We will never return to the light!=We will never return to the light! -dark elf wizard=dark elf wizard -Dark elf wizards are very powerful and dangerous. They are specialised in dark magic.=Dark elf wizards are very powerful and dangerous. They are specialised in dark magic. -The Spider Queen will avenge me!=The Spider Queen will avenge me! -dark elf viceroy=dark elf viceroy -You see a dark elf viceroy.=You see a dark elf viceroy. -Keep away from me, sunlight dweller!=Keep away from me, sunlight dweller! -dark elf ranger=dark elf ranger -You see a dark elf ranger.=You see a dark elf ranger. -Keep away from me, sunlight dweller!=Keep away from me, sunlight dweller! -dark elf sacerdotist=dark elf sacerdotist -You see a dark elf sacerdotist.=You see a dark elf sacerdotist. -The Queen of Spiders will take her revenge on you!=The Queen of Spiders will take her revenge on you! -dark elf admiral=dark elf admiral -You see a dark elf admiral.=You see a dark elf admiral. -We are the darkness you fear!=We are the darkness you fear! -Fear the dark elf armies!=Fear the dark elf armies! -dark elf master=dark elf master -You see a dark elf master. Beware of his high skills on magic and swordsmanship!=You see a dark elf master. Beware of his high skills on magic and swordsmanship! -Darkness will fall upon you!=Darkness will fall upon you! -You will never see the light again!=You will never see the light again! -dark elf matronmother=dark elf matronmother -You see a dark elf matronmother.=You see a dark elf matronmother. -Now, you will pay.=Now, you will pay. -You disturbed my rest!=You disturbed my rest! -elf=elf -You see an elf which loves the forest and lives in peace.=You see an elf which loves the forest and lives in peace. -militia elf=militia elf -You see a militia elf which trains hard to beat you!=You see a militia elf which trains hard to beat you! -archer elf=archer elf -You see an archer elf which can do much damage with its wooden arrows.=You see an archer elf which can do much damage with its wooden arrows. -soldier elf=soldier elf -You see a soldier elf, a good partner of the militia elves.=You see a soldier elf, a good partner of the militia elves. -mage elf=mage elf -You see a mage elf. She can feel pure magic when she stands outside in the forest and just frees her mind.=You see a mage elf. She can feel pure magic when she stands outside in the forest and just frees her mind. -commander elf=commander elf -You see a busy commander elf. He has control over the army of elves.=You see a busy commander elf. He has control over the army of elves. -archmage elf=archmage elf -You see an archmage elf. She is pretty.=You see an archmage elf. She is pretty. -elf sacerdotist=elf sacerdotist -You see an elf sacerdotist.=You see an elf sacerdotist. -elf wizard=elf wizard -You see an elf wizard. He is a very wise elf who knows almost every kind of magic. He likes to use nature spells to make every plant and creature fertile, but he is also able to defend himself when he has to do.=You see an elf wizard. He is a very wise elf who knows almost every kind of magic. He likes to use nature spells to make every plant and creature fertile, but he is also able to defend himself when he has to do. -elf bodyguard=elf bodyguard -You see an elf bodyguard.=You see an elf bodyguard. -amazoness giant=amazoness giant -You see an amazoness giant. She looks very beautiful but don't be deceived by that!=You see an amazoness giant. She looks very beautiful but don't be deceived by that! -giant=giant -You look up into the face of a huge giant. His physical proportions and extraordinary strength should give you goosebumps.=You look up into the face of a huge giant. His physical proportions and extraordinary strength should give you goosebumps. -I seek the blood of a Semos Man!=I seek the blood of a Semos Man! -Fee Fie Foe Fum!!=Fee Fie Foe Fum!! -elder giant=elder giant -You see an elder giant. For many years he lived alone and had to hide because he was hunted by humans! Now he is old and has decided not to hide any longer because he wants to see something else in his life.=You see an elder giant. For many years he lived alone and had to hide because he was hunted by humans! Now he is old and has decided not to hide any longer because he wants to see something else in his life. -Gnomes! Run away!=Gnomes! Run away! -You may steal my money but you'll never take my heart!=You may steal my money but you'll never take my heart! -master giant=master giant -You see a master giant with dark black eyes. His blood pumps loudly into his heart.=You see a master giant with dark black eyes. His blood pumps loudly into his heart. -Thou shalt die!=Thou shalt die! -Worms will feast on your corpse!=Worms will feast on your corpse! -black giant=black giant -You see a tall black giant. His armor and sword will hit you hard. Be prepared!=You see a tall black giant. His armor and sword will hit you hard. Be prepared! -Leave me now, before it is too late!=Leave me now, before it is too late! -Who dare challenge me?=Who dare challenge me? -imperial general giant=imperial general giant -You see an imperial general giant.=You see an imperial general giant. -giant kobold=giant kobold -You see a giant kobold. Though generally playful it doesn't quite know it's own strength. When it asks for a hug, it's best to decline that offer.=You see a giant kobold. Though generally playful it doesn't quite know it's own strength. When it asks for a hug, it's best to decline that offer. -Hug?=Hug? -kasarkutominubat=kasarkutominubat -You see a kasarkutominubat.=You see a kasarkutominubat. -gnome=gnome -You see a gnome who lives in the mountains.=You see a gnome who lives in the mountains. -Giiiiiaaants! Run away!=Giiiiiaaants! Run away! -mage gnome=mage gnome -You see a mage gnome, she cleans the dirty mountain.=You see a mage gnome, she cleans the dirty mountain. -Giiiiiaaants! Run away!=Giiiiiaaants! Run away! -infantry gnome=infantry gnome -You see an infantry gnome who will protect his little town against the humans!=You see an infantry gnome who will protect his little town against the humans! -Ready! Aim! Runnnnnnnnnnn=Ready! Aim! Runnnnnnnnnnn -cavalryman gnome=cavalryman gnome -You see a cavalryman gnome who does long travels to search for gold.=You see a cavalryman gnome who does long travels to search for gold. -Ready! Aim! Runnnnnnnnnnn=Ready! Aim! Runnnnnnnnnnn -goblin=goblin -You see a goblin, it is an evil and mischievous creature.=You see a goblin, it is an evil and mischievous creature. -Umm! Tasty meat.=Umm! Tasty meat. -veteran goblin=veteran goblin -You see a veteran goblin, an old warrior...=You see a veteran goblin, an old warrior... -Breakfast time!=Breakfast time! -soldier goblin=soldier goblin -You see a soldier goblin, a young warrior.=You see a soldier goblin, a young warrior. -amazoness archer=amazoness archer -You see an amazoness archer. She handles her bow quite well and her arrows are very dangerous when she shoots them at you out of the forest!=You see an amazoness archer. She handles her bow quite well and her arrows are very dangerous when she shoots them at you out of the forest! -amazoness archer commander=amazoness archer commander -You see an amazoness archer commander. She is the leader of amazoness archers. Her bow skills are incredible and her arrows pierce everything.=You see an amazoness archer commander. She is the leader of amazoness archers. Her bow skills are incredible and her arrows pierce everything. -amazoness bodyguard=amazoness bodyguard -You see an amazoness bodyguard who will guarantee the safety to the people of Amazon island.=You see an amazoness bodyguard who will guarantee the safety to the people of Amazon island. -amazoness coastguard=amazoness coastguard -You see an amazoness coastguard. She protects the coasts of Amazon Island from intruders. She is not too happy to see you running in her island.=You see an amazoness coastguard. She protects the coasts of Amazon Island from intruders. She is not too happy to see you running in her island. -amazoness coastguard mistress=amazoness coastguard mistress -You see an amazoness coastguard mistress. Even if they are women, these blue haired mistresses should not be underestimated.=You see an amazoness coastguard mistress. Even if they are women, these blue haired mistresses should not be underestimated. -amazoness commander=amazoness commander -You see an amazoness commander who is specialised in eliminating any strangers who dare to take a step to her island.=You see an amazoness commander who is specialised in eliminating any strangers who dare to take a step to her island. -amazoness elite coastguard=amazoness elite coastguard -You see an amazoness elite coastguard. When it is her shift to protect the island, you would just wish to have stayed at home.=You see an amazoness elite coastguard. When it is her shift to protect the island, you would just wish to have stayed at home. -amazoness hunter=amazoness hunter -You see an amazoness hunter. She creeps through the forest to hunt animals. But she doesn't like that you are in her hunting area!=You see an amazoness hunter. She creeps through the forest to hunt animals. But she doesn't like that you are in her hunting area! -amazoness vigilance=amazoness vigilance -You see an amazoness vigilance. Her senses are well tuned, so you have to be very silent when you don't want her to hear you!=You see an amazoness vigilance. Her senses are well tuned, so you have to be very silent when you don't want her to hear you! -amazoness imperator=amazoness imperator -You see an amazoness imperator. She is the emperor of Amazon island and has ruled it for decades and won't let you get past her very easily.=You see an amazoness imperator. She is the emperor of Amazon island and has ruled it for decades and won't let you get past her very easily. -bandit=bandit -You see a lean and mean bandit. He's out to get your life and purse!=You see a lean and mean bandit. He's out to get your life and purse! -disciple assassin=disciple assassin -You see a disciple assassin. He is quite young but he has learned to fight and kill already.=You see a disciple assassin. He is quite young but he has learned to fight and kill already. -My dad can beat your dad.=My dad can beat your dad. -I'm gonna tell my mommy.=I'm gonna tell my mommy. -Teacher, make him stop.=Teacher, make him stop. -apprentice assassin=apprentice assassin -You see an apprentice assassin. He has been taught some very awesome moves and methods, so he is already able to kill an enemy almost perfectly!=You see an apprentice assassin. He has been taught some very awesome moves and methods, so he is already able to kill an enemy almost perfectly! -Bring it on!=Bring it on! -Any time you're ready.=Any time you're ready. -You want a piece of me?=You want a piece of me? -Come on, i dare you.=Come on, i dare you. -hunter=hunter -You see a hunter.=You see a hunter. -I always get my prey!=I always get my prey! -assassin=assassin -You see an assassin. He is very good at killing his victims silently without being seen by anyone.=You see an assassin. He is very good at killing his victims silently without being seen by anyone. -Time to die.=Time to die. -ninja=ninja -Your keen eyes made you able to see this fast ninja. Prepare for a fight!=Your keen eyes made you able to see this fast ninja. Prepare for a fight! -samurai=samurai -You see a samurai.=You see a samurai. -shadows assassin=shadows assassin -You see a shadows assassin. He knows how to become one with the shadows and to move in the dark without being seen or making any sound.=You see a shadows assassin. He knows how to become one with the shadows and to move in the dark without being seen or making any sound. -master assassin=master assassin -You see a master assassin. He is a master of assassination! He is able to kill an enemy without letting him know that he is already there!=You see a master assassin. He is a master of assassination! He is able to kill an enemy without letting him know that he is already there! -Why do you return?=Why do you return? -You've been warned before.=You've been warned before. -Have you lost your marbles?=Have you lost your marbles? -barbarian=barbarian -You see a barbarian.=You see a barbarian. -barbarian wolf=barbarian wolf -You see a barbarian wolf.=You see a barbarian wolf. -barbarian elite=barbarian elite -You see a barbarian elite.=You see a barbarian elite. -barbarian priest=barbarian priest -You see a barbarian priest.=You see a barbarian priest. -barbarian chaman=barbarian chaman -You see a barbarian chaman.=You see a barbarian chaman. -King he say kill!=King he say kill! -barbarian leader=barbarian leader -You see a barbarian leader.=You see a barbarian leader. -Me destroy you!=Me destroy you! -barbarian king=barbarian king -You see a barbarian king.=You see a barbarian king. -blordrough quartermaster=blordrough quartermaster -You see a man who gave up his life as a puppet of the Blordrough army, all for the love of dragons. He is wonderfully happy.=You see a man who gave up his life as a puppet of the Blordrough army, all for the love of dragons. He is wonderfully happy. -We might be in hiding, but we are STILL mighty.=We might be in hiding, but we are STILL mighty. -blordrough corporal=blordrough corporal -You see a man who feels his past indicates how he should be treated now but desparately wishes to exercise his intelect in a game of chess.=You see a man who feels his past indicates how he should be treated now but desparately wishes to exercise his intelect in a game of chess. -You WILL show us the respect we deserve.=You WILL show us the respect we deserve. -Care for a game of chess?=Care for a game of chess? -blordrough storm trooper=blordrough storm trooper -You see a man who is but a fraction of his former glory as one of the most feared foes of Faiumoni. Now, his main concern is keeping his house clean and tidy.=You see a man who is but a fraction of his former glory as one of the most feared foes of Faiumoni. Now, his main concern is keeping his house clean and tidy. -Wipe your feet before entering our domain.=Wipe your feet before entering our domain. -I'll teach you to defile our sanctuary.=I'll teach you to defile our sanctuary. -cannibal woman=cannibal woman -You see a cannibal woman. She wants to make a soup out of your bones!=You see a cannibal woman. She wants to make a soup out of your bones! -Zag-Zag!=Zag-Zag! -cannibal=cannibal -You see a cannibal. He hunts you for cooking and eating your fresh meat! It's useless to tell him that your flesh is not good, better fight him or run away!=You see a cannibal. He hunts you for cooking and eating your fresh meat! It's useless to tell him that your flesh is not good, better fight him or run away! -Ou-Garrrr!=Ou-Garrrr! -elder cannibal=elder cannibal -You see an elder cannibal.=You see an elder cannibal. -Yummie!=Yummie! -chaos soldier=chaos soldier -You see a chaos soldier. Chaos soldiers are servants of the evil. Killing you is one of their evil plans.=You see a chaos soldier. Chaos soldiers are servants of the evil. Killing you is one of their evil plans. -chaos warrior=chaos warrior -You see a chaos warrior. This chaotic creature is fighting with a big blade to slay his enemies.=You see a chaos warrior. This chaotic creature is fighting with a big blade to slay his enemies. -Defy order! Seek chaos!=Defy order! Seek chaos! -chaos commander=chaos commander -You see a chaos commander who is working on an evil plan. You should take care of him before he fulfills his duty.=You see a chaos commander who is working on an evil plan. You should take care of him before he fulfills his duty. -Chaos in the wrath!=Chaos in the wrath! -chaos sorcerer=chaos sorcerer -You see a chaos sorcerer. Chaos sorcerers will cast some evil spells on you if you don't obey them.=You see a chaos sorcerer. Chaos sorcerers will cast some evil spells on you if you don't obey them. -I will summon chaos and fury upon you!=I will summon chaos and fury upon you! -chaos dragonrider=chaos dragonrider -You see a chaos dragonrider. He is very well trained in dragon riding, but he can also fight well on the ground.=You see a chaos dragonrider. He is very well trained in dragon riding, but he can also fight well on the ground. -chaos lord=chaos lord -You see a chaos lord who is one of the strongest chaos creatures in Faiumoni. You should prepare well before attacking him.=You see a chaos lord who is one of the strongest chaos creatures in Faiumoni. You should prepare well before attacking him. -Chaos will rule!=Chaos will rule! -chaos overlord=chaos overlord -You see a chaos overlord. It is him who directs the creation of evil plans and gives orders to all chaotic creatures which exist.=You see a chaos overlord. It is him who directs the creation of evil plans and gives orders to all chaotic creatures which exist. -I am become death, destroyer of worlds.=I am become death, destroyer of worlds. -chaos pawn=chaos pawn -You see a pawn for a game of chess. He will drop nothing if you kill him.=You see a pawn for a game of chess. He will drop nothing if you kill him. -chaos rook=chaos rook -You see a rook for a game of chess. He will drop nothing if you kill him.=You see a rook for a game of chess. He will drop nothing if you kill him. -chaos knight=chaos knight -You see a knight for a game of chess. He will drop nothing if you kill him.=You see a knight for a game of chess. He will drop nothing if you kill him. -chaos bishop=chaos bishop -You see a bishop for a game of chess. He will not reward you if you kill him.=You see a bishop for a game of chess. He will not reward you if you kill him. -chaos king=chaos king -You see a king of a game of chess. He will reward nothing if you kill him.=You see a king of a game of chess. He will reward nothing if you kill him. -chaos queen=chaos queen -You see a queen piece for a game of chess. She will reward nothing if you kill her.=You see a queen piece for a game of chess. She will reward nothing if you kill her. -imperial defender=imperial defender -You see an imperial defender.=You see an imperial defender. -imperial veteran=imperial veteran -You see an imperial veteran. He fought in many battles and wars. Now he is old, but over the years he always looked for a new enemy to fight against.=You see an imperial veteran. He fought in many battles and wars. Now he is old, but over the years he always looked for a new enemy to fight against. -imperial archer=imperial archer -You see an imperial archer.=You see an imperial archer. -imperial priest=imperial priest -You see an imperial priest. The church has fallen out of favor with the citizens as of late, but this imperial priest still clings to the faith.=You see an imperial priest. The church has fallen out of favor with the citizens as of late, but this imperial priest still clings to the faith. -imperial elite guardian=imperial elite guardian -You see an Imperial Elite Guardian. He is a very well trained guardian and he will protect his environment until the end.=You see an Imperial Elite Guardian. He is a very well trained guardian and he will protect his environment until the end. -imperial scientist=imperial scientist -You see an imperial scientist. He is quite clever but also a little bit crazy and unfortunately he uses his intelligence for evil experiments.=You see an imperial scientist. He is quite clever but also a little bit crazy and unfortunately he uses his intelligence for evil experiments. -imperial high priest=imperial high priest -You see an imperial high priest who's troubled by the actions of the imperial science department. Be careful, he might take those frustrations out on you!=You see an imperial high priest who's troubled by the actions of the imperial science department. Be careful, he might take those frustrations out on you! -imperial archer leader=imperial archer leader -You see an imperial archer leader.=You see an imperial archer leader. -imperial elite archer=imperial elite archer -You see an imperial elite archer.=You see an imperial elite archer. -imperial leader=imperial leader -You see a well dressed imperial leader. It's troops will try to dash you.=You see a well dressed imperial leader. It's troops will try to dash you. -imperial knight=imperial knight -You see an imperial knight.=You see an imperial knight. -imperial chief=imperial chief -You see an imperial chief.=You see an imperial chief. -imperial commander=imperial commander -You see an imperial commander.=You see an imperial commander. -Our troops will crush you!=Our troops will crush you! -imperial general=imperial general -You see an imperial general with a huge scar above his eye. He is still strong, don't think that he will not see you!=You see an imperial general with a huge scar above his eye. He is still strong, don't think that he will not see you! -Our troops will crush you!=Our troops will crush you! -emperor dalmung=emperor dalmung -You see an emperor dalmung who stands before you. Once a powerful warlock trained by a mighty magician, but he disappeared decades ago. Now it seems he's in league with Ivan Abe!=You see an emperor dalmung who stands before you. Once a powerful warlock trained by a mighty magician, but he disappeared decades ago. Now it seems he's in league with Ivan Abe! -My empire is undefeatable!=My empire is undefeatable! -kalavan housewife=kalavan housewife -You see a kalavan housewife. She lives in Kalavan city and she very angry with rude people who want to steal her food out of the kitchen and destroy her beautiful flower garden!=You see a kalavan housewife. She lives in Kalavan city and she very angry with rude people who want to steal her food out of the kitchen and destroy her beautiful flower garden! -kalavan peasant=kalavan peasant -You see a kalavan peasant. He works in the fields around Kalavan city. As he heard there were strangers in the city he came to help the kalavan citizens in fighting the enemies!=You see a kalavan peasant. He works in the fields around Kalavan city. As he heard there were strangers in the city he came to help the kalavan citizens in fighting the enemies! -kalavan wisewoman=kalavan wisewoman -You see a kalavan wisewoman. Normally she sits in her small room and does some handworking but now she wants to have some action!=You see a kalavan wisewoman. Normally she sits in her small room and does some handworking but now she wants to have some action! -kalavan citizen=kalavan citizen -You see a kalavan citizen. He lives in kalavan city and tries to protect it from invaders!=You see a kalavan citizen. He lives in kalavan city and tries to protect it from invaders! -madaram archer=madaram archer -You see a madaram archer.=You see a madaram archer. -madaram peasant=madaram peasant -You see a madaram peasant.=You see a madaram peasant. -madaram trooper=madaram trooper -You see a madaram trooper.=You see a madaram trooper. -madaram soldier=madaram soldier -You see a madaram soldier.=You see a madaram soldier. -madaram healer=madaram healer -You see a madaram healer.=You see a madaram healer. -madaram axeman=madaram axeman -You see a madaram axeman.=You see a madaram axeman. -madaram queen=madaram queen -You see a madaram queen.=You see a madaram queen. -madaram hero=madaram hero -You see a madaram hero.=You see a madaram hero. -madaram windwalker=madaram windwalker -You see a madaram windwalker.=You see a madaram windwalker. -madaram cavalry=madaram cavalry -You see a madaram cavalry.=You see a madaram cavalry. -madaram stalker=madaram stalker -You see a madaram stalker.=You see a madaram stalker. -madaram buster blader=madaram buster blader -You see a madaram buster blader.=You see a madaram buster blader. -madaram pawn=madaram pawn -You see a pawn for a game of chess. It will reward nothing if killed.=You see a pawn for a game of chess. It will reward nothing if killed. -madaram rook=madaram rook -You see a rook for a game of chess. It will scarcely reward you to kill it.=You see a rook for a game of chess. It will scarcely reward you to kill it. -madaram knight=madaram knight -You see a knight, a chess piece. He won't reward you if you kill him.=You see a knight, a chess piece. He won't reward you if you kill him. -madaram bishop=madaram bishop -You see a bishop for a game of chess. It will reward you nothing if you slay it.=You see a bishop for a game of chess. It will reward you nothing if you slay it. -madaram king=madaram king -You see a king to play chess with, he will reward you nothing if you kill him.=You see a king to play chess with, he will reward you nothing if you kill him. -madaram queen =madaram queen -You see a queen piece for a game of chess. She will reward nothing if you kill her.=You see a queen piece for a game of chess. She will reward nothing if you kill her. -mithrilbourgh soldier=mithrilbourgh soldier -You see a mithrilbourgh soldier.=You see a mithrilbourgh soldier. -mithrilbourgh archer=mithrilbourgh archer -You see a mithrilbourgh archer.=You see a mithrilbourgh archer. -mithrilbourgh knight=mithrilbourgh knight -You see a mithrilbourgh knight.=You see a mithrilbourgh knight. -mithrilbourgh elite archer=mithrilbourgh elite archer -You see a mithrilbourgh elite archer.=You see a mithrilbourgh elite archer. -mithrilbourgh sergeant=mithrilbourgh sergeant -You see a mithrilbourgh sergeant.=You see a mithrilbourgh sergeant. -mithrilbourgh lieutenant=mithrilbourgh lieutenant -You see a mithrilbourgh lieutenant.=You see a mithrilbourgh lieutenant. -mithrilbourgh colonel=mithrilbourgh colonel -You see a mithrilbourgh colonel.=You see a mithrilbourgh colonel. -mithrilbourgh wizard=mithrilbourgh wizard -You see a mithrilbourgh wizard.=You see a mithrilbourgh wizard. -mithrilbourgh general=mithrilbourgh general -You see a mithrilbourgh general. Some call him Hawkeyes. He cast his gaze over the city walls and saw you coming from miles away.=You see a mithrilbourgh general. Some call him Hawkeyes. He cast his gaze over the city walls and saw you coming from miles away. -monk=monk -You see a monk. Monks are very calm and peaceful. They live alone among themselves, but they don't want to be interrupted by anyone.=You see a monk. Monks are very calm and peaceful. They live alone among themselves, but they don't want to be interrupted by anyone. -Meet you after Cataclysm.=Meet you after Cataclysm. -The end of the world is nigh...=The end of the world is nigh... -Yield to the Power!=Yield to the Power! -I see you, heretic!=I see you, heretic! -darkmonk=darkmonk -You see a Darkmonk. Darkmonks can control dark powers, and they will do anything to get you out of their way!=You see a Darkmonk. Darkmonks can control dark powers, and they will do anything to get you out of their way! -Hail to the greater Power!=Hail to the greater Power! -The Cataclysm cometh!=The Cataclysm cometh! -devil monk=devil monk -You see a devil monk. He is a member of a devil cult which practises black rituals.=You see a devil monk. He is a member of a devil cult which practises black rituals. -risecia thug=risecia thug -You see a risecia thug, stay away from him!=You see a risecia thug, stay away from him! -risecia archer=risecia archer -You see a risecia archer, just one of the warriors who wants to protect his chief.=You see a risecia archer, just one of the warriors who wants to protect his chief. -risecia swordsman=risecia swordsman -You see a risecia swordsman, the blade of his sword will cut your head!=You see a risecia swordsman, the blade of his sword will cut your head! -Chief Falatheen of the Risecia=Chief Falatheen of the Risecia -You see the Chief Falatheen of the Risecia, he doesn't want to die! His little warriors protect him against invaders.=You see the Chief Falatheen of the Risecia, he doesn't want to die! His little warriors protect him against invaders. -littlewitch=littlewitch -You see a little witch. Witches are are evil little girls who are very dangerous.=You see a little witch. Witches are are evil little girls who are very dangerous. -littlewizard=littlewizard -You see a little wizard. Although he is a child, he is already able to cast powerful spells.=You see a little wizard. Although he is a child, he is already able to cast powerful spells. -robot aruthon=robot aruthon -You see a robot aruthon.=You see a robot aruthon. -dark aruthon=dark aruthon -You see a dark aruthon.=You see a dark aruthon. -leprechaun=leprechaun -You see a leprechaun, you would be lucky if you found his treasure.=You see a leprechaun, you would be lucky if you found his treasure. -They're always after my Lucky Charms!!=They're always after my Lucky Charms!! -Clovers and rainbows... stars and horseshoes...=Clovers and rainbows... stars and horseshoes... -littlefairy=littlefairy -You see a little fairy, which is magical and nice.=You see a little fairy, which is magical and nice. -clurichaun=clurichaun -You see a clurichaun. He is rich, but you don't know if you are able to find his gold!=You see a clurichaun. He is rich, but you don't know if you are able to find his gold! -Floating blue balloons...=Floating blue balloons... -Join me for a drink, lassie?=Join me for a drink, lassie? -brain ahouga=brain ahouga -You see a brain ahouga, a very strange creature only living in your dreams!=You see a brain ahouga, a very strange creature only living in your dreams! -blue mohiko=blue mohiko -You see a blue mohiko.=You see a blue mohiko. -red roohako=red roohako -You see a red roohako. It is coming for you in your deepest dreams.=You see a red roohako. It is coming for you in your deepest dreams. -arachne=arachne -You see Arachne, a horrid half woman half spider. With so many legs she can hit you very fast, and her poisonous bite is fierce.=You see Arachne, a horrid half woman half spider. With so many legs she can hit you very fast, and her poisonous bite is fierce. -cat woman=cat woman -You see a cat woman. She's agile, stealthy, fast and sharp, so stay focused and don't get cut!=You see a cat woman. She's agile, stealthy, fast and sharp, so stay focused and don't get cut! -frogman=frogman -You see a frogman which lives in a lake which isn't very deep.=You see a frogman which lives in a lake which isn't very deep. -elite frogman=elite frogman -You see an elite frogman. His huge eyes let you shiver!=You see an elite frogman. His huge eyes let you shiver! -wizard frogman=wizard frogman -You see a mighty wizard frogman. His wand and magical cloak show his wisdom and power.=You see a mighty wizard frogman. His wand and magical cloak show his wisdom and power. -kobold=kobold -You see a kobold. People say that it is a mythical spirit.=You see a kobold. People say that it is a mythical spirit. -Grrrr! Wooof!=Grrrr! Wooof! -soldier kobold=soldier kobold -You see a soldier kobold, he's protecting his king.=You see a soldier kobold, he's protecting his king. -Woorf wer warf!=Woorf wer warf! -archer kobold=archer kobold -You see an archer kobold. It runs away from humans.=You see an archer kobold. It runs away from humans. -Wssss! Warf wit!=Wssss! Warf wit! -veteran kobold=veteran kobold -You see a veteran kobold, it is mighty!=You see a veteran kobold, it is mighty! -leader kobold=leader kobold -You see a leader kobold, one of the mighty warriors.=You see a leader kobold, one of the mighty warriors. -minotaur=minotaur -You see a minotaur. He escaped from his labyrinth and is very angry now!=You see a minotaur. He escaped from his labyrinth and is very angry now! -You will never find the way out!=You will never find the way out! -minotaur king=minotaur king -You see a Minotaur King. He doesn't have to escape from his labyrinth to be very angry...=You see a Minotaur King. He doesn't have to escape from his labyrinth to be very angry... -I am the king of this area!=I am the king of this area! -naga=naga -You see a naga. She awaits unwary victims to whom she may give her deadly kiss.=You see a naga. She awaits unwary victims to whom she may give her deadly kiss. -high naga=high naga -You see a high naga.=You see a high naga. -armed naga=armed naga -You see an armed naga.=You see an armed naga. -lamia=lamia -You see a lamia.=You see a lamia. -ratman=ratman -You see a ratman. He is a mutation that comes from old times.=You see a ratman. He is a mutation that comes from old times. -You, humans, never leave us alone!=You, humans, never leave us alone! -ratwoman=ratwoman -You see a ratwoman. She is a mutation of women with the rats in the century XVIII.=You see a ratwoman. She is a mutation of women with the rats in the century XVIII. -You humans never leave us alone!=You humans never leave us alone! -archrat=archrat -You see an archrat. You will be distracted with its aura, be careful...=You see an archrat. You will be distracted with its aura, be careful... -Feel my wrath!=Feel my wrath! -You're messing with the rats?!=You're messing with the rats?! -Your death has come!=Your death has come! -sheepman=sheepman -You see a sheepman.=You see a sheepman. -I'm no fluffy lamb!=I'm no fluffy lamb! -armored sheepman=armored sheepman -You see an armored sheepman.=You see an armored sheepman. -You're baaaarmy to attack me!=You're baaaarmy to attack me! -elder sheepman=elder sheepman -You see an elder sheepman.=You see an elder sheepman. -Bah! Stay away!=Bah! Stay away! -elite sheepman=elite sheepman -You see an elite sheepman.=You see an elite sheepman. -Baaaaack away!=Baaaaack away! -werewolf=werewolf -You see a werewolf. Normally he is a human but at fullmoon nights he turns into a dangerous beast! His poison seems to last forever.=You see a werewolf. Normally he is a human but at fullmoon nights he turns into a dangerous beast! His poison seems to last forever. -xenocium=xenocium -You see a xenocium.=You see a xenocium. -oni warrior=oni warrior -You see an oni warrior. His purple skin color should not lull you into a false sense of security!=You see an oni warrior. His purple skin color should not lull you into a false sense of security! -oni archer=oni archer -You see an oni archer. His arrows will follow you everywhere for protecting his queen!=You see an oni archer. His arrows will follow you everywhere for protecting his queen! -oni priest=oni priest -You see a mysterious oni priest, uttering strange incantations.=You see a mysterious oni priest, uttering strange incantations. -oni king=oni king -You see the oni king. His power leads brave oni troops around his kingdom.=You see the oni king. His power leads brave oni troops around his kingdom. -Revere me, the Oni King!=Revere me, the Oni King! -oni queen=oni queen -You see the oni queen. She supports her husband and takes an eye onto their kingdom while he conquers new land and fights on battlefields.=You see the oni queen. She supports her husband and takes an eye onto their kingdom while he conquers new land and fights on battlefields. -You must bow before the Oni Queen.=You must bow before the Oni Queen. -orc=orc -You see an orc which is noisy and silly.=You see an orc which is noisy and silly. -orc spearman=orc spearman -You see an orc spearman. Run away fast before a spear pierces you.=You see an orc spearman. Run away fast before a spear pierces you. -orc hunter=orc hunter -You see an orc hunter. It it seeking for you!=You see an orc hunter. It it seeking for you! -orc warrior=orc warrior -You see an orc warrior which doesn't like you searching in the mountain.=You see an orc warrior which doesn't like you searching in the mountain. -orc chief=orc chief -You see an orc chief which is too busy to attend to you!=You see an orc chief which is too busy to attend to you! -mountain orc=mountain orc -You see a mountain orc.=You see a mountain orc. -mountain orc warrior=mountain orc warrior -You see a mountain orc warrior.=You see a mountain orc warrior. -mountain orc hunter=mountain orc hunter -You see a mountain orc hunter.=You see a mountain orc hunter. -mountain orc chief=mountain orc chief -You see a mountain orc chief.=You see a mountain orc chief. -cyclops=cyclops -You see a cyclops. It just has one eye.=You see a cyclops. It just has one eye. -ogre=ogre -You see an ogre, it is nude and rude!=You see an ogre, it is nude and rude! -elder ogre=elder ogre -You see an elder ogre, he's in the last moments of his life, take pity on him.=You see an elder ogre, he's in the last moments of his life, take pity on him. -ogre soldier=ogre soldier -You see an ogre soldier, smelling like it didn't have had a bath for years. Ewww.=You see an ogre soldier, smelling like it didn't have had a bath for years. Ewww. -superogre=superogre -You see a superogre which belongs to the family of very material creatures, the Ogres. Ever since this one happened upon a peculiar helmet and has been revered among its peers. Take care, it throws a mean punch!=You see a superogre which belongs to the family of very material creatures, the Ogres. Ever since this one happened upon a peculiar helmet and has been revered among its peers. Take care, it throws a mean punch! -troll=troll -You see a troll, be careful in his terrain.=You see a troll, be careful in his terrain. -red troll=red troll -You see a red troll, he's burning with anger.=You see a red troll, he's burning with anger. -cave troll=cave troll -You see a cave troll.=You see a cave troll. -Uggga yggga arghhhhh=Uggga yggga arghhhhh -Ooggga UGGga arhhh=Ooggga UGGga arhhh -zombie rat=zombie rat -You see a hungry zombie rat and it doesn't like to see you.=You see a hungry zombie rat and it doesn't like to see you. -SHAAAAAAA!!=SHAAAAAAA!! -SHREEAK!!=SHREEAK!! -ghost hound=ghost hound -As you catch sight of its shaggy shape and gleaming evil eyes, you suddenly remember all the horror stories around the dreaded ghost hound!=As you catch sight of its shaggy shape and gleaming evil eyes, you suddenly remember all the horror stories around the dreaded ghost hound! -Ghhrr!=Ghhrr! -WooOouuuUuh!=WooOouuuUuh! -fallen warrior=fallen warrior -You see a fallen warrior.=You see a fallen warrior. -fallen priest=fallen priest -You see a fallen priest. He was once just a regular human priest, until the dark powers corrupted him and turned him to the dark side.=You see a fallen priest. He was once just a regular human priest, until the dark powers corrupted him and turned him to the dark side. -fallen high priest=fallen high priest -You see a fallen high priest.=You see a fallen high priest. -lich=lich -You see a lich, a dark desolate creature which has been doomed to wander in endless turmoil, feeding on the souls of the righteous.=You see a lich, a dark desolate creature which has been doomed to wander in endless turmoil, feeding on the souls of the righteous. -dead lich=dead lich -You see a dead lich with his huge green and heavy cloak. Although he is dead and bony, he'll seek revenge for his too early passing and will always return fast and ruthless!=You see a dead lich with his huge green and heavy cloak. Although he is dead and bony, he'll seek revenge for his too early passing and will always return fast and ruthless! -high lich=high lich -The terrible grinning skull of a high lich leers at you as it prepares to slaughter you in a myriad of magical ways.=The terrible grinning skull of a high lich leers at you as it prepares to slaughter you in a myriad of magical ways. -death knight=death knight -You see a death knight. Some time ago he fought in tournaments where his only aim was to kill as many enemies as possible.=You see a death knight. Some time ago he fought in tournaments where his only aim was to kill as many enemies as possible. -necrosophia=necrosophia -You see Necrosophia. She is a mighty beast, she will burn you with fire while you are disoriented by the rainbow beans.=You see Necrosophia. She is a mighty beast, she will burn you with fire while you are disoriented by the rainbow beans. -mummy=mummy -You see a mummy which usually sleeps in a coffin.=You see a mummy which usually sleeps in a coffin. -royal mummy=royal mummy -You see a royal mummy. You wonder what keeps this king's soul from finding peace.=You see a royal mummy. You wonder what keeps this king's soul from finding peace. -skeleton=skeleton -You see a skeleton which survives to get revenge.=You see a skeleton which survives to get revenge. -Thou shall not pass!=Thou shall not pass! -tiny skelly=tiny skelly -You see a tiny skelly. It is silly, little and evil, be careful with its poison...=You see a tiny skelly. It is silly, little and evil, be careful with its poison... -Thou shall not maim!=Thou shall not maim! -warrior skeleton=warrior skeleton -You see a warrior skeleton, it's just a normal skeleton with a shield!=You see a warrior skeleton, it's just a normal skeleton with a shield! -Thou shall not kill!=Thou shall not kill! -elder skeleton=elder skeleton -You see the bones of an old man. He lived to a ripe old age, and is sure to know a thing or two that separates him from all the vengeful skeletons that died young.=You see the bones of an old man. He lived to a ripe old age, and is sure to know a thing or two that separates him from all the vengeful skeletons that died young. -Thou shall not survive!=Thou shall not survive! -demon skeleton=demon skeleton -You see a demon skeleton. Demon skeletons have ascended from the underworld and they are going to take over this world. You really should slay them before it is too late!=You see a demon skeleton. Demon skeletons have ascended from the underworld and they are going to take over this world. You really should slay them before it is too late! -Thou shall not rob!=Thou shall not rob! -gashadokuro=gashadokuro -A giant figure made of bone, known only as gashadokuro, towers before you. He is created from the bones of starving humans.=A giant figure made of bone, known only as gashadokuro, towers before you. He is created from the bones of starving humans. -ghost=ghost -You see a ghost, don't be afraid! It doesn't seem to be evil.=You see a ghost, don't be afraid! It doesn't seem to be evil. -Ooooouuuuuh!=Ooooouuuuuh! -death=death -You see Death. Do you have the will to stare him in the face? Today he's not in the mood to bargain with your soul.=You see Death. Do you have the will to stare him in the face? Today he's not in the mood to bargain with your soul. -Judgement is coming!=Judgement is coming! -Uuuuhhhhh!, i'm gonna get you!=Uuuuhhhhh!, i'm gonna get you! -invisible man=invisible man -You see nothing but the landscape. As you stare at the point where you think you have seen something, you suddenly see the slight contour of a man!=You see nothing but the landscape. As you stare at the point where you think you have seen something, you suddenly see the slight contour of a man! -My unnatural state should evoke fear in you ...=My unnatural state should evoke fear in you ... -green phantom=green phantom -You see a green phantom.=You see a green phantom. -incorporeal armor=incorporeal armor -You see an incorporeal armor. You are quite surprised as it walks towards you because there is nobody in it.=You see an incorporeal armor. You are quite surprised as it walks towards you because there is nobody in it. -Thou shall not pillage!=Thou shall not pillage! -black death=black death -You see a black death. With his scythe he reaps your soul and then he takes it over the river where it has to stay until judgement day arrives.=You see a black death. With his scythe he reaps your soul and then he takes it over the river where it has to stay until judgement day arrives. -Your time to die has come!=Your time to die has come! -Say goodbye to this world!=Say goodbye to this world! -golden death=golden death -You see the golden death. He came to take your soul away to pay for all your sins.=You see the golden death. He came to take your soul away to pay for all your sins. -You will dream of me tonight...=You will dream of me tonight... -You will pay for your greed!=You will pay for your greed! -vampire bride=vampire bride -You see a vampire bride. She was resurrected from the dead by a wicked vampire lord.=You see a vampire bride. She was resurrected from the dead by a wicked vampire lord. -vampirette=vampirette -You see a Vampirette. Beware of its sharp teeth! She wants to drink your blood and turn you into a vampire!=You see a Vampirette. Beware of its sharp teeth! She wants to drink your blood and turn you into a vampire! -vampire lord=vampire lord -You see a vampire lord. Be careful, he is after your blood!=You see a vampire lord. Be careful, he is after your blood! -bloody zombie=bloody zombie -You see a bloody zombie. Can you see the drops of blood which fall from his body?=You see a bloody zombie. Can you see the drops of blood which fall from his body? -brrraaaaaaaaaains=brrraaaaaaaaaains -zombie=zombie -You see a zombie. It woke up just to take revenge, be silent.=You see a zombie. It woke up just to take revenge, be silent. -headless monster=headless monster -You see a headless monster, how can he hear that we come to him?=You see a headless monster, how can he hear that we come to him? -rotten zombie=rotten zombie -You see a rotten zombie. You are disgusted as you see its rotten skin that hangs down in pieces from his half rotten bones.=You see a rotten zombie. You are disgusted as you see its rotten skin that hangs down in pieces from his half rotten bones. -bluuergghhhoooorrghhhhh=bluuergghhhoooorrghhhhh From 3d971f37b5011743c69852b2bc5845488924dfd1 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Mon, 19 Jan 2026 19:01:17 -0800 Subject: [PATCH 075/162] Update locale template --- data/languages/template.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/languages/template.txt b/data/languages/template.txt index 301920f472..3d244004c6 100644 --- a/data/languages/template.txt +++ b/data/languages/template.txt @@ -1097,6 +1097,7 @@ venom gland= You see the venom gland of a giant king cobra. It is filled with deadly toxin.= pelt= +You see a pelt of animal skin. It's used to make clothes and leather armor.= leather thread= You see a strand of sturdy leather thread.= @@ -1265,6 +1266,9 @@ You see an imperial ring. It is imbued with the strength of a king.= enhanced imperial ring= You see an enhanced imperial ring. It eminates the auras of strength and defense.= +ring of clarity= +You see a ring of clarity. You feel more aware while wearing it.= + ## scrolls @@ -1407,6 +1411,9 @@ You see a silvery gm token. Does it bring you pride?= bronze gm token= You see a bronze gm token. Does it bring you pride?= +four-leaf clover= +You see a lucky four-leaf clover. What are the chances of finding one!?= + ## swords @@ -1635,6 +1642,7 @@ You see a killer bat which will suck your blood!= giant bat= giant killer bat= +You see a giant killer bat. As if small wasn't pesky enough, these giant ones are capable of taking down anyone who dares come before them.= piglet= You see a piglet, a bit dirty.= @@ -1702,6 +1710,7 @@ black bear= You see a strong black bear which hibernates in winter.= polar bear= +You see a polar bear which lives in the icy desert. Beware! It can take you down with its powerful claws!= ## animal_aquatic @@ -2268,6 +2277,7 @@ cannibal= You see a cannibal. He hunts you for cooking and eating your fresh meat! It's useless to tell him that your flesh is not good, better fight him or run away!= elder cannibal= +You see an elder cannibal. For years it has eaten humans. It will not stop until its hunger is satisfied.= cannibal warrior= You see a cannibal warrior.= From de3658035014da8d607a721195dcb797b39ec47e Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Mon, 19 Jan 2026 19:06:11 -0800 Subject: [PATCH 076/162] Run 'ant locale_update' --- data/languages/es.txt | 4108 ++++++++++++++++++++++++++++------------- 1 file changed, 2836 insertions(+), 1272 deletions(-) diff --git a/data/languages/es.txt b/data/languages/es.txt index 0d4abc6e4e..e767074ca7 100644 --- a/data/languages/es.txt +++ b/data/languages/es.txt @@ -1,529 +1,2922 @@ -dress=vestido -You see a dress, which provides practically no defense. It is barely worth picking up.=Ves un vestido, que no proporciona prácticamente defensa alguna. Apenas vale la pena recogerlo. -leather armor=armadura de cuero -You see a worn suit of leather armor. It will provide only minimal protection.=Ves un traje de armadura de cuero desgastado. Sólo te proporcionará una mínima protección. -leather cuirass=coraza de cuero -You see a leather cuirass, well made but still able to be pierced by sharp swords.=Ves una coraza de cuero, bien hecha pero que todavía puede ser traspasada por espadas afiladas. -leather scale armor=armadura de escamas de cuero -You see a suit of leather scale armor. The leather is toughened somehow for better protection.=Ves un traje de armadura de escamas de cuero. El cuero ha sido endurecido de alguna forma para una mejor protección. -pauldroned leather cuirass=coraza de cuero con hombreras. -You see a pauldroned leather cuirass. It was crafted to withstand minor attacks.=Ves una coraza de cuero con hombreras. Fue diseñada para soportar ataques menores. -studded armor=armadura tachonada -You see a suit of studded armor. Some studs are loose or rusty but it is still fit for purpose.=Ves un traje de armadura tachonada. Algunos tachones están sueltos u oxidados pero todavía es adecuada para su finalidad. -chain armor=cota de malla -You see a suit of chain armor. Perhaps even if you don't need it, you can sell it.=Ves un traje de armadura de cota de malla. Quizá incluso si no la necesitas, puedas venderla. -enhanced chainmail=cota de malla mejorada -You see a robust suit of enhanced chainmail. The links are closely spaced so even the sharpest point should not pierce it.=Ves un traje robusto de cota de malla. Los eslabones están muy próximos entre sí por lo que incluso la punta más afilada no debería de poder traspasarla. -scale armor=armadura de escamas -You see a suit of scale armor. It is not flexible like chain, but will be a better defense.=Ves un traje de armadura de escamas. No es flexible como la cota de malla, pero te proporcionará una mejor defensa. -iron scale armor=armadura de escamas de hierro -You see a suit of iron scale armor, whose rounded scales will protect you from many blows.=Ves un traje de armadura de escamas de hierro, cuyas escamas redondeadas te protegerán de muchos golpes. -golden chainmail=cota de malla de oro -You see a valuable suit of golden chainmail. It is crafted from fine links of expensive metal.=Ves un valioso traje de cota de malla de oro. Se ha elaborado a partir de finos eslabones de caro metal. -pauldroned iron cuirass=coraza de hierro con hombreras -You see a formidable pauldroned iron cuirass. The pauldrons (shoulder pieces) will protect your upper half.=Ves una formidable coraza de hierro con hombreras. Las hombreras (las piezas de los hombros) protegerán tu mitad superior. -plate armor=armadura de placas de acero -You see a suit of plate armor. You imagine it would be heavy but the steel is well tempered and the suit is very strong.=Ves un traje de armadura de placas de acero. Te imaginas que será muy pesada pero el acero está bien templado y el traje es muy resistente. -red armor=armadura roja -You see a suit of red armor. The color is a striking crimson.=Ves un traje de armadura roja. Su color es de un llamativo tono carmesí. -blue armor=armadura azul -You see a suit of blue armor. The color is stunning azure.=Ves un traje de armadura azul. Su color es un impresionante azul. -elvish armor=armadura élfica -You see a suit of elvish armor. It's made from tree leaves! But somehow constructed to give strong defense.=Ves un traje de armadura élfica ¡Está elaborada a partir de hojas de árbol! Pero construido de alguna forma para proporcionar una resistente defensa. + +## +## Language: () +## Translators: [, ...] +## + + +# items names and descriptions + +## armors + barbarian armor=armadura de bárbaro You see a suit of barbarian armor. It's dirty and smelly, but still, rather strong.=Ves un traje de armadura de bárbaro. Está sucia y huele mal, pero aún así, es bastante resistente. -golden armor=armadura de oro -You see a suit of golden armor. It's made from the best materials with great attention to detail.=Ves un traje de armadura de oro. Está elaborada a partir de los mejores materiales con gran atención al detalle. -shadow armor=armadura de sombra -You see a suit of shadow armor. It's hard to decide with what it is made, it is so dark.=Ves un traje dearmadura de sombra. Es difícil decidir de qué está hecha, es tan oscura. -dwarvish armor=armadura enana -You see a dwarvish armor. It's made with ingenuity and skill.=Ves una armadura enana. Se ha elaborado con ingenio y habilidad. -stone armor=armadura de piedra -You see a suit of stone armor. Swords will crumble if they try to pierce it.=Ves un traje de armadura de piedra. Las espadas se quebrarán si intentan traspasarla. -ice armor=armadura de hielo -You see a suit of ice armor, to protect even the coldest of hearts.=Ves un traje de armadura de hielo, para proteger incluso al mas frío de los corazones. -chaos armor=armadura del caos -You see a suit of chaos armor. The reflecting contrasting colors make no sense to you.=Ves un traje de armadura del caos. Los contrastantes colores que se reflejan en ella para ti no tienen ningún sentido. -xeno armor=armadura de xeno -You see a suit of xeno armor. The colors remind you of the xenocium hybrid creature.=Ves un traje de armadura de xeno. Sus colores te recuerdan a la criatura híbrida xenocium. -mainio armor=armadura de mainio -You see a strange strange suit of mainio armor. What it lacks in subtlety it makes up for with strength.=Ves un extraño traje de armadura de mainio. Lo que le falta en sutileza lo suple con fortaleza. -magic plate armor=armadura de placas de acero mágica -You see a suit of magic plate armor. The steel is well tempered and the suit is very strong.=Ves un traje de armadura de placas de acero mágica. El acero está bien templado y el traje es muy resistente. + black armor=armadura negra You see a suit of black armor. Does it put you in a dark mood?=Ves un traje de armadura negra ¿Te pone de negro humor? + +blue armor=armadura azul +You see a suit of blue armor. The color is stunning azure.=Ves un traje de armadura azul. Su color es un impresionante azul. + +chain armor=cota de malla +You see a suit of chain armor. Perhaps even if you don't need it, you can sell it.=Ves un traje de armadura de cota de malla. Quizá incluso si no la necesitas, puedas venderla. + +chaos armor=armadura del caos +You see a suit of chaos armor. The reflecting contrasting colors make no sense to you.=Ves un traje de armadura del caos. Los contrastantes colores que se reflejan en ella para ti no tienen ningún sentido. + +dress=vestido +You see a dress, which provides practically no defense. It is barely worth picking up.=Ves un vestido, que no proporciona prácticamente defensa alguna. Apenas vale la pena recogerlo. + +dwarvish armor=armadura enana +You see a dwarvish armor. It's made with ingenuity and skill.=Ves una armadura enana. Se ha elaborado con ingenio y habilidad. + +elvish armor=armadura élfica +You see a suit of elvish armor. It's made from tree leaves! But somehow constructed to give strong defense.=Ves un traje de armadura élfica ¡Está elaborada a partir de hojas de árbol! Pero construido de alguna forma para proporcionar una resistente defensa. + +enhanced chainmail=cota de malla mejorada +You see a robust suit of enhanced chainmail. The links are closely spaced so even the sharpest point should not pierce it.=Ves un traje robusto de cota de malla. Los eslabones están muy próximos entre sí por lo que incluso la punta más afilada no debería de poder traspasarla. + +golden armor=armadura de oro +You see a suit of golden armor. It's made from the best materials with great attention to detail.=Ves un traje de armadura de oro. Está elaborada a partir de los mejores materiales con gran atención al detalle. + +golden chainmail=cota de malla de oro +You see a valuable suit of golden chainmail. It is crafted from fine links of expensive metal.=Ves un valioso traje de cota de malla de oro. Se ha elaborado a partir de finos eslabones de caro metal. + +ice armor=armadura de hielo +You see a suit of ice armor, to protect even the coldest of hearts.=Ves un traje de armadura de hielo, para proteger incluso al mas frío de los corazones. + +iron scale armor=armadura de escamas de hierro +You see a suit of iron scale armor, whose rounded scales will protect you from many blows.=Ves un traje de armadura de escamas de hierro, cuyas escamas redondeadas te protegerán de muchos golpes. + +leather armor=armadura de cuero +You see a worn suit of leather armor. It will provide only minimal protection.=Ves un traje de armadura de cuero desgastado. Sólo te proporcionará una mínima protección. + +leather cuirass=coraza de cuero +You see a leather cuirass, well made but still able to be pierced by sharp swords.=Ves una coraza de cuero, bien hecha pero que todavía puede ser traspasada por espadas afiladas. + +leather scale armor=armadura de escamas de cuero +You see a suit of leather scale armor. The leather is toughened somehow for better protection.=Ves un traje de armadura de escamas de cuero. El cuero ha sido endurecido de alguna forma para una mejor protección. + +magic plate armor=armadura de placas de acero mágica +You see a suit of magic plate armor. The steel is well tempered and the suit is very strong.=Ves un traje de armadura de placas de acero mágica. El acero está bien templado y el traje es muy resistente. + +mainio armor=armadura de mainio +You see a strange suit of mainio armor. What it lacks in subtlety it makes up for with strength.= + mithril armor=armadura de mithril You see a suit of mithril armor. Its tightly woven links are truly amazing.=Ves un traje de armadura de mithril. Sus eslabones apretadamente tejidos son verdaderamante asombrosos. + +pauldroned iron cuirass=coraza de hierro con hombreras +You see a formidable pauldroned iron cuirass. The pauldrons (shoulder pieces) will protect your upper half.=Ves una formidable coraza de hierro con hombreras. Las hombreras (las piezas de los hombros) protegerán tu mitad superior. + +pauldroned leather cuirass=coraza de cuero con hombreras. +You see a pauldroned leather cuirass. It was crafted to withstand minor attacks.= + +plate armor=armadura de placas de acero +You see a suit of plate armor. You imagine it would be heavy but the steel is well tempered and the suit is very strong.=Ves un traje de armadura de placas de acero. Te imaginas que será muy pesada pero el acero está bien templado y el traje es muy resistente. + +red armor=armadura roja +You see a suit of red armor. The color is a striking crimson.=Ves un traje de armadura roja. Su color es de un llamativo tono carmesí. + +royal armor= +You see a suit of royal armor. This armor is fit for a king.= + +scale armor=armadura de escamas +You see a suit of scale armor. It is not flexible like chain, but will be a better defense.=Ves un traje de armadura de escamas. No es flexible como la cota de malla, pero te proporcionará una mejor defensa. + +scuba gear= +You see a scuba suit with a heavy helmet attached. It is dense enough to offer protection under the waves but of little use on land.= + +shadow armor=armadura de sombra +You see a suit of shadow armor. It's hard to decide with what it is made, it is so dark.=Ves un traje dearmadura de sombra. Es difícil decidir de qué está hecha, es tan oscura. + +stone armor=armadura de piedra +You see a suit of stone armor. Swords will crumble if they try to pierce it.=Ves un traje de armadura de piedra. Las espadas se quebrarán si intentan traspasarla. + +studded armor=armadura tachonada +You see a suit of studded armor. Some studs are loose or rusty but it is still fit for purpose.=Ves un traje de armadura tachonada. Algunos tachones están sueltos u oxidados pero todavía es adecuada para su finalidad. + +xeno armor=armadura de xeno +You see a suit of xeno armor. The colors remind you of the xenocium hybrid creature.=Ves un traje de armadura de xeno. Sus colores te recuerdan a la criatura híbrida xenocium. + + +## arrows + wooden arrow=flecha de madera You see a wooden arrow. With a supply of arrows in one hand and a bow in the other you can attack from a distance.=Ves una flecha de madera. Con un surtido de flechas en una mano y un arco en la otra puedes atacar a distancia. + steel arrow=flecha de acero You see a shining steel arrow. With plenty of these, and a good bow, you'll be a formidable archer.=Ves una flecha de reluciente acero. Con muchas de éstas, y un buen arco, serás un arquero formidable. + golden arrow=flecha de oro -You see a golden arrow. With a fist full of these and a good bow, you will surely take down your enemies quicker.=Ves una flecha de oro. Con un puñado de éstas y un buen arco, derribarás a tus enemigos más rápido. +You see a golden arrow. With a fist full of these and a good bow, you will surely take down your enemies quicker.= + +fire arrow= +You see a fire arrow. The tip burns brightly.= + +ice arrow= +You see an ice arrow. It can deliver a bitter sting.= + +light arrow= +You see a light arrow. It shines with a holy radiance.= + +dark arrow= +You see a dark arrow. It's hard to describe.= + power arrow=flecha de potencia -You see a power arrow. The sting of this arrow will surely defeat your enemies, when equipped with a bow.=Ves una flecha de potencia. La punzada de esta flecha seguramente derrotará a tus enemigos, cuando vaya equipada con un arco. -sickle=hoz -You see a sickle, it is a useful tool for farming.=Ves una hoz, es una herramienta útil para la labranza. -old scythe=guadaña vieja -You see an old scythe, it used to be weapon of death. But now it is only a useful tool for farming.=Ves una vieja guadaña, solía ser el arma de la muerte. Pero ahora sólo es una útil herramienta de labranza. -small axe=hacha pequeña -You see a small axe. It appears well made but you suspect it is too light to do much damage.=Ves un hacha pequeña. Parece bien elaborada pero sospechas que es demasiado ligera para hacer mucho daño. -hand axe=hacha de mano -You see a hand axe, well worn from years of use but may prove useful.=Ves un hacha de mano, muy desgastada por años de uso pero podría resultar útil. +You see a power arrow. The sting of this arrow will surely defeat your enemies, when equipped with a bow.= + + +## axes + axe=hacha You see a rusty but heavy axe. What it lacks in sharpness it makes up for in weight.=Ves un hacha oxidada pero pesada. Lo que le falta en filo lo suple con peso -battle axe=hacha de batalla -You see a battle axe. It is well crafted and sharp despite its age.=Ves un hacha de batalla. Está bien diseñada y afilada a pesar de su antigüedad. -scythe=guadaña -You see the weapon of death - a scythe. It looks dangerous but perhaps also a useful tool for farming.=Ves el arma de la muerte - una guadaña. Parece peligrosa pero quizá también sea una herramienta útil para la labranza. -twoside axe=hacha de doble hoja -You see a well crafted twoside axe.=Ves un hacha de doble hoja bien elaborada. + bardiche=bardiche You see a rare and powerful bardiche.=Ves una rara y poderosa bardiche. -golden twoside axe=hacha de doble hoja de oro -You see a golden twoside axe. This axe is a rare find.=Ves un hacha de doble hoja de oro. Este hacha es un raro hallazgo. -halberd=alabarda -You see a rare halberd, with an axe's blade fused onto a shaft. It is both heavy and keen-edged.=Ves una rara alabarda, con una hoja de hacha enastada en un astil. Es a la vez pesada y de borde afilado. -magic twoside axe=hacha de doble hoja mágica -You see a magic twoside axe. The nature of the magic isn't clear to you.=Ves un hacha de doble hoja mágica. La naturaleza de la magia no está clara para ti. -durin axe=hacha de durin -You see a durin axe, a great prize from the dwarves.=Ves un hacha de durin, un gran premio de los enanos. -black scythe=guadaña negra -You see a black scythe. Its attack is awesome for a farming tool.=Ves una guadaña negra. Su ataque es asombroso para tratarse de una herramienta de labranza. -chaos axe=hacha del caos -You see a chaos axe. The handle is some alloy you can't recognize and the blade is golden colored, but thinking too long about it makes you confused.=Ves un hacha del caos. El astil es de una aleación que no sabes reconocer y la hoja es de color dorado, pero pensar mucho en ello te causa confusión. + +battle axe=hacha de batalla +You see a battle axe. It is well crafted and sharp despite its age.=Ves un hacha de batalla. Está bien diseñada y afilada a pesar de su antigüedad. + black halberd=alabarda negra You see a black halberd. It's immensely heavy so will make huge blows but you can only swing it at a very slow rate.=Ves una alabarda negra. Es inmensamente pesada asi que producirá enormes golpes pero sólo la puedes mover a un ritmo muy lento. + +black scythe=guadaña negra +You see a black scythe. Its attack is awesome for a farming tool.=Ves una guadaña negra. Su ataque es asombroso para tratarse de una herramienta de labranza. + +chaos axe=hacha del caos +You see a chaos axe. The handle is some alloy you can't recognize and the blade is golden colored, but thinking too long about it makes you confused.=Ves un hacha del caos. El astil es de una aleación que no sabes reconocer y la hoja es de color dorado, pero pensar mucho en ello te causa confusión. + +durin axe=hacha de durin +You see a durin axe, a great prize from the dwarves.=Ves un hacha de durin, un gran premio de los enanos. + +golden twoside axe=hacha de doble hoja de oro +You see a golden twoside axe. This axe is a rare find.= + +halberd=alabarda +You see a rare halberd, with an axe's blade fused onto a shaft. It is both heavy and keen-edged.=Ves una rara alabarda, con una hoja de hacha enastada en un astil. Es a la vez pesada y de borde afilado. + +hand axe=hacha de mano +You see a hand axe, well worn from years of use but may prove useful.=Ves un hacha de mano, muy desgastada por años de uso pero podría resultar útil. + +magic twoside axe=hacha de doble hoja mágica +You see a magic twoside axe. The nature of the magic isn't clear to you.=Ves un hacha de doble hoja mágica. La naturaleza de la magia no está clara para ti. + +old scythe=guadaña vieja +You see an old scythe, it used to be a weapon of death. But now it is only a useful tool for farming.= + +scythe=guadaña +You see the weapon of death - a scythe. It looks dangerous but perhaps also a useful tool for farming.=Ves el arma de la muerte - una guadaña. Parece peligrosa pero quizá también sea una herramienta útil para la labranza. + +sickle=hoz +You see a sickle, it is a useful tool for farming.=Ves una hoz, es una herramienta útil para la labranza. + +small axe=hacha pequeña +You see a small axe. It appears well made but you suspect it is too light to do much damage.=Ves un hacha pequeña. Parece bien elaborada pero sospechas que es demasiado ligera para hacer mucho daño. + +twoside axe=hacha de doble hoja +You see a well crafted twoside axe.=Ves un hacha de doble hoja bien elaborada. + + +## books + black book=libro negro You see the black book that Jynath kept out for so long.=Ves el libro negro que Jynath mantuvo oculto durante tanto tiempo. + blue book=libro azul You see a book with the words GEMS AND MINERALS on the front cover.=Ves un libro azul con las palabras GEMAS Y MINERALES en la cubierta frontal. -leather boots=botas de cuero -You see a simple pair of leather boots to give your feet some protection.=Ves un simple par de botas de cuero para dar algo de protección a tus pies. -studded boots=botas tachonadas -You see a pair of worn studded boots with moderate protection for your feet.=Ves un par de botas tachonadas desgastadas que proporcionan una protección moderada a tus pies. -chain boots=botas de cota de malla -You see a pair of chain boots, quite rusty but still strong.=Ves un par de botas de cota de malla, bastante oxidadas pero todavía resistentes. -red boots=botas rojas. -You see a pair of red boots, the color reminds you of fresh blood.=Ves un par de botas rojas, su color te recuerda a la sangre fresca. -steel boots=botas de acero -You see a pair of steel boots, fit for any soldier.=Ves un par de botas de acero, adecuadas para cualquier soldado. -blue boots=botas azules -You see a pair of blue boots.=Ves un par de botas azules. -elvish boots=botas élficas -You see a pair of elvish boots.=Ves un par de botas élficas. -golden boots=botas de oro -You see a pair of golden boots. They will be heavy to wear but well worth their weight.=Ves un par de botas de oro. Serán pesadas de llevar pero valen su peso. -shadow boots=botas de sombra -You see a pair of shadow boots. You can't fathom what they are made of.=Ves un par de botas de sombra. No puedes entender de qué están hechas. -stone boots=botas de piedra -You see a pair of stone boots. They may be heavy, but they protect your feet well.=Ves un par de botas de piedra. Puede que sean pesadas, pero te protegen bien los pies. -chaos boots=botas del caos -You see a pair of chaos boots. Your steps are unsteady in them, but the extra defense they give is worth it.=Ves un par de botas del caos. Tus pasos son inestables con ellas, pero la defensa extra que proporcionan lo vale. -mainio boots=botas de mainio -You see a pair of mainio boots. It's hard to believe that boots looking like this would protect your feet so well as they do.=Ves un par de botas de mainio. Cuesta creer que unas botas con esa apariencia te pudiesen proteger los pies tan bien como lo hacen. -green thing boots=botas de la cosa verde -You see a pair of green thing boots. They're slimy inside, ewwww.=Ves un par de botas de la cosa verde. Estan pegajosas por dentro, puajjj. -xeno boots=botas de xeno -You see a fine specimen of craftmanship, a pair of xeno boots.=Ves una excelente obra de artesanía, un par de botas de xeno. + +bestiary= +You see a bestiary, containing information about enemies found in Faiumoni.= + + +## boots + black boots=botas negras You stub your toe on this pair of black boots. Perhaps they bring you bad luck?=te diste en el dedo del pie con algo usando estas botas ¿Quizá te dan mala suerte? -mithril boots=botas de mithril -You see a sparkling set of mithril boots.=Ves un brillante conjunto de botas de mithril. + +blue boots=botas azules +You see a pair of blue boots.=Ves un par de botas azules. + +chain boots=botas de cota de malla +You see a pair of chain boots, quite rusty but still strong.=Ves un par de botas de cota de malla, bastante oxidadas pero todavía resistentes. + +chaos boots=botas del caos +You see a pair of chaos boots. Your steps are unsteady in them, but the extra defense they give is worth it.=Ves un par de botas del caos. Tus pasos son inestables con ellas, pero la defensa extra que proporcionan lo vale. + +elvish boots=botas élficas +You see a pair of elvish boots.=Ves un par de botas élficas. + +golden boots=botas de oro +You see a pair of golden boots. They will be heavy to wear but well worth their weight.=Ves un par de botas de oro. Serán pesadas de llevar pero valen su peso. + +green thing boots=botas de la cosa verde +You see a pair of green thing boots. They're slimy inside, ewwww.=Ves un par de botas de la cosa verde. Estan pegajosas por dentro, puajjj. + killer boots=botas asesinas You see a high heeled pair of killer boots. Are you brave enough to wear them?=Ves un par de botas asesinas de tacón alto ¿Eres lo bastante valiente como para llevarlas? + +leather boots=botas de cuero +You see a simple pair of leather boots to give your feet some protection.=Ves un simple par de botas de cuero para dar algo de protección a tus pies. + +magic plate boots= + +mainio boots=botas de mainio +You see a pair of mainio boots. It's hard to believe that boots looking like this would protect your feet so well as they do.=Ves un par de botas de mainio. Cuesta creer que unas botas con esa apariencia te pudiesen proteger los pies tan bien como lo hacen. + +mithril boots=botas de mithril +You see a sparkling set of mithril boots.=Ves un brillante conjunto de botas de mithril. + +red boots=botas rojas. +You see a pair of red boots, the color reminds you of fresh blood.=Ves un par de botas rojas, su color te recuerda a la sangre fresca. + +royal boots= +You see a pair of royal boots. They have magical properties= + +shadow boots=botas de sombra +You see a pair of shadow boots. You can't fathom what they are made of.=Ves un par de botas de sombra. No puedes entender de qué están hechas. + +steel boots=botas de acero +You see a pair of steel boots, fit for any soldier.=Ves un par de botas de acero, adecuadas para cualquier soldado. + +stone boots=botas de piedra +You see a pair of stone boots. They may be heavy, but they protect your feet well.= + +studded boots=botas tachonadas +You see a pair of worn studded boots with moderate protection for your feet.=Ves un par de botas tachonadas desgastadas que proporcionan una protección moderada a tus pies. + +xeno boots=botas de xeno +You see a fine specimen of craftmanship, a pair of xeno boots.=Ves una excelente obra de artesanía, un par de botas de xeno. + + +## boxes + present=regalo You see a present. Open it.=Ves un regalo. Abrelo. + basket=cesta You see an easter basket. Look inside.=Ves una cesta de Pascua. Mira dentro de ella. + stocking=calcetín You see a christmas stocking. Look inside.=Ves un calcetín de Navidad. Mira dentro de él. -cloak=capa -You see a simple cloth cloak.=Ves una simple capa de tela. -elf cloak=capa de elfo -You see a white elf cloak. It doesn't look very warm.=Ves una capa de elfo blanca. No parece muy cálida. -dwarf cloak=capa enana -You see a dwarf cloak. Apparently this passes for fashion in some parts, but to you it looks more functional than fashionable.=Ves una capa enana. Aparentemente esto es lo que se entiende por moda en algunos lugares, pero a ti te resulta más funcional que de moda. -red cloak=capa roja -You see a red cloak covered in polka dots. It's terribly snazzy.=Ves una capa roja cubierta de lunares. Es terriblemente elegante. -elvish cloak=capa élfica -You see an elvish cloak. The material is dark, but thick and warm.=Ves una capa élfica. Su material es oscuro, pero es grueso y cálido. -blue striped cloak=capa de rayas azules -You see a fashionable blue striped cloak.=Ves una capa de rayas azules de moda. -blue elf cloak=capa de elfo azul -You see a blue elf cloak. The material is thick and warm.=Ves una capa de elfo azul. El material es grueso y cálido. -stone cloak=capa de piedra -You see a stone cloak. It's hard to tell how it was made, as the fibres look like narrow threads of mineral.=Ves una capa de piedra. Es difícil decir como se elaboró, ya que las fibras parecen delgados hilos de mineral. -green dragon cloak=capa de dragón verde. -You see a huge green dragon cloak. It's probably too big for you but, even dragging on the floor it will provide excellent protection.=Ves una enorme capa de dragón verde. Es probablemente demasiado grande para ti pero, aunque arrastre por el suelo te proporcionará una protección excelente. -bone dragon cloak=capa de dragón de hueso -You see a bone dragon cloak. It's incredibly old, like its last owner.=Ves una capa de dragón de hueso. Es increíblemente antigua, como su último dueño. -lich cloak=capa de lich -You see a purple lich cloak. It's stained with blood - yours, from the previous undead owner, or perhaps the blood of his enemies...=Ves una capa púrpura de lich. Está manchada de sangre - la tuya, la de su anterior dueño, o quizá la sangre de sus enemigos... -vampire cloak=capa de vampiro -You see a vibrant red vampire cloak. Wearing it sends a shiver down your spine.=Ves una capa de vampiro de vibrante color rojo. Llevarla puesta te produce un escalofrío por tu columna vertebral. -shadow cloak=capa de sombra -You see a shadow cloak, in colors of the shadow armor.=Ves una capa de sombra, en los mismos colores que la armadura de sombra. -blue dragon cloak=capa de dragón azul -You see a blue dragon cloak. The weave is tight and strong, though you wish the color drew less attention.=Ves una capa de dragón azul. La trama es apretada y resistente, aunque desearías que su color llamase menos la atención. -red dragon cloak=capa de dragón rojo -You see a red dragon cloak. He didn't have one for a long time but finally caved in to peer pressure and got one.=Ves una capa de dragón rojo. Él no había tenido ninguna durante mucho tiempo pero finalmente cedió a la presión de sus compañeros y se buscó una. -black dragon cloak=capa de dragón negro -You see a torn section from an enormous black dragon cloak. You're very lucky: the piece is just the right size for a human to wear.=Ves un retal arrancado de una enorme capa de dragón negro. Tienes mucha suerte: la pieza es justo del tamaño adecuado para que lo lleve un humano. -golden cloak=capa de oro -You see a golden cloak. See how the light glistens off the gold, it is a prized possession.=Ves una capa de oro. Ves cómo la luz brilla saliendo del oro, es una preciada posesión. -chaos cloak=capa del caos -You see a chaos cloak. The colors look like oil shimmering on a puddle.=Ves una capa del caos. Sus colores parecen aceite brillando en un charco. -mainio cloak=capa de mainio -You see a mainio cloak. It's flashing colors are absurd! But you wear it because it's very well made.=Ves una capa de mainio ¡Sus colores parpadeantes son absurdos! Pero la llevas puesta porque está muy bien elaborada. -xeno cloak=capa de xeno -You see a xeno cloak. It's heavy and thick, giving you a good protection.=Ves una capa de xeno. Es pesada y gruesa, proporcionandote una buena protección. + + +## cloaks + black cloak=capa negra You see a black cloak. The last owner had black thoughts. Will you?=Ves una capa negra. Su último dueño tuvo negros pensamientos ¿Los tendrás tú? + +black dragon cloak=capa de dragón negro +You see a torn section from an enormous black dragon cloak. You're very lucky: the piece is just the right size for a human to wear.=Ves un retal arrancado de una enorme capa de dragón negro. Tienes mucha suerte: la pieza es justo del tamaño adecuado para que lo lleve un humano. + +blue dragon cloak=capa de dragón azul +You see a blue dragon cloak. The weave is tight and strong, though you wish the color drew less attention.=Ves una capa de dragón azul. La trama es apretada y resistente, aunque desearías que su color llamase menos la atención. + +blue elf cloak=capa de elfo azul +You see a blue elf cloak. The material is thick and warm.=Ves una capa de elfo azul. El material es grueso y cálido. + +blue striped cloak=capa de rayas azules +You see a fashionable blue striped cloak.=Ves una capa de rayas azules de moda. + +bone dragon cloak=capa de dragón de hueso +You see a bone dragon cloak. It's incredibly old, like its last owner.=Ves una capa de dragón de hueso. Es increíblemente antigua, como su último dueño. + +chaos cloak=capa del caos +You see a chaos cloak. The colors look like oil shimmering on a puddle.=Ves una capa del caos. Sus colores parecen aceite brillando en un charco. + +cloak=capa +You see a simple cloth cloak.=Ves una simple capa de tela. + +dwarf cloak=capa enana +You see a dwarf cloak. Apparently this passes for fashion in some parts, but to you it looks more functional than fashionable.=Ves una capa enana. Aparentemente esto es lo que se entiende por moda en algunos lugares, pero a ti te resulta más funcional que de moda. + +elf cloak=capa de elfo +You see a white elf cloak. It doesn't look very warm.=Ves una capa de elfo blanca. No parece muy cálida. + +elvish cloak=capa élfica +You see an elvish cloak. The material is dark, but thick and warm.=Ves una capa élfica. Su material es oscuro, pero es grueso y cálido. + +golden cloak=capa de oro +You see a golden cloak. See how the light glistens off the gold, it is a prized possession.= + +green dragon cloak=capa de dragón verde. +You see a huge green dragon cloak. It's probably too big for you but, even dragging on the floor it will provide excellent protection.=Ves una enorme capa de dragón verde. Es probablemente demasiado grande para ti pero, aunque arrastre por el suelo te proporcionará una protección excelente. + +lich cloak=capa de lich +You see a purple lich cloak. It's stained with blood - yours, from the previous undead owner, or perhaps the blood of his enemies...=Ves una capa púrpura de lich. Está manchada de sangre - la tuya, la de su anterior dueño, o quizá la sangre de sus enemigos... + +magic cloak= +You see a magic cloak.= + +mainio cloak=capa de mainio +You see a mainio cloak. Its flashing colors are absurd! But you wear it because it's very well made.= + mithril cloak=capa de mithril You see a mithril cloak. Its weave is so fine and its looks are breathtaking.=Ves una capa de mithril. Su trama es tan fina y su apariencia quita la respiración. -rift cloak=capa de rift -You see a rift cloak. Almost useless in the battle, but saves your life when you enter a magical rift.=Ves una capa de rift. Casi inútil en la batalla, pero te salva la vida cuando entras en un rift mágico. -club=garrote -You see a wooden club. It won't kill much but is better than no weapon.=Ves un garrote de madera. No matará mucho pero es mejor que no tener ningún arma. -staff=bastón -You see a staff. This is a seldom seen or used weapon.=Ves un bastón. Ésta es un arma que rara vez se ve o se usa. -mace=maza -You see a mace, much neglected in years of use.=Ves una maza, muy descuidada en los años de uso. -flail=mangual -You see a military flail. Swinging it in circles will tire you but it will be an effective weapon.=Ves un mangual militar. Moverlo en círculos te cansará pero será un arma efectiva. -enhanced mace=maza mejorada -You see an enhanced mace. The heavy attacking end makes it hard to balance.=Ves una maza mejorada. Su pesado extremo de ataque la hace difícil de equilibrar. -golden mace=maza de oro -You see a shining golden mace. Despite looking ornamental, it is sharp enough to do some damage.=Ves una maza de oro brillante. A pesar de parece ornamental, está lo bastante afilada para hacer algún daño. -skull staff=bastón de calavera -You see a rare skull staff. It appears mystical but will work like any other staff.=Ves un bastón de calavera. Parece místico pero funcionará como cualquier otro bastón. -morning star=lucero del alba -You see a morning star. This is a very rare item indeed.=Ves un lucero del alba. Éste es realmente un artículo raro. -hammer=martillo -You see a common hammer. It is heavy enough that you should be able to bludgeon your enemies with it, but only slowly=Ves un martillo común. Es bastante pesado por lo que deberías de ser capaz de aporrear a tus enemigos con él, pero sólo con lentitud. -golden hammer=martillo de oro -You see a valuable golden hammer. This golden weapon may be worth a lot to someone. It has a slow rate of attack.=Ves un valioso martillo de oro. Este arma de oro puede valer muchísimo para alguien. Tiene un ritmo de ataque lento. -war hammer=martillo de guerra -You see a huge war hammer. It seems strong but is so heavy that you can only lift it to attack every so often..=Ves un enorme martillo de guerra. Parece potente pero es tan pesado que sólo lo puedes levantar de vez en cuando para atacar.. -ice war hammer=martillo de guerra de hielo -You see a ice war hammer. The last owner must have been huge, to wield it.=Ves un martillo de guerra de hielo. Su último dueño debe de haber sido enorme, para manejarlo. + +red cloak=capa roja +You see a red cloak covered in polka dots. It's terribly snazzy.=Ves una capa roja cubierta de lunares. Es terriblemente elegante. + +red dragon cloak=capa de dragón rojo +You see a red dragon cloak. He didn't have one for a long time but finally caved in to peer pressure and got one.=Ves una capa de dragón rojo. Él no había tenido ninguna durante mucho tiempo pero finalmente cedió a la presión de sus compañeros y se buscó una. + +royal cloak= +You see a royal cloak. It will protect you against mighty foes.= + +shadow cloak=capa de sombra +You see a shadow cloak, in colors of the shadow armor.=Ves una capa de sombra, en los mismos colores que la armadura de sombra. + +stone cloak=capa de piedra +You see a stone cloak. It's hard to tell how it was made, as the fibres look like narrow threads of mineral.=Ves una capa de piedra. Es difícil decir como se elaboró, ya que las fibras parecen delgados hilos de mineral. + +vampire cloak=capa de vampiro +You see a vibrant red vampire cloak. Wearing it sends a shiver down your spine.=Ves una capa de vampiro de vibrante color rojo. Llevarla puesta te produce un escalofrío por tu columna vertebral. + +xeno cloak=capa de xeno +You see a xeno cloak. It's heavy and thick, giving you good protection.= + + +## clubs + chaos hammer=martillo del caos You see a chaos hammer. It is a fearsome weapon.=Ves un martillo del caos. Es un arma temible. -ugmash=ugmash -You see a huge ugmash. It can attack with a faster rate than many other clubs.=Ves un enorme ugmash. Puede atacar a un ritmo más rápido que muchos otros garrotes. -vulcano hammer=martillo de vulcano -You see a vulcano hammer. It's said to be a weapon of a God, but attacks with a snail like pace.=Ves un martillo de vulcano. Se dice que es el arma de un dios, pero ataca al ritmo de un caracol. + +club=garrote +You see a wooden club. It won't kill much but is better than no weapon.=Ves un garrote de madera. No matará mucho pero es mejor que no tener ningún arma. + club of thorns=garrote de espinas You see the club of thorns. The thorns are full with blood of tortured humans. It is hugely powerful but will drain your life to use it.=Ves el garrote de espinas. Las espinas estan llenas de sangre de humanos torturados. Es enormemente poderosa pero el usarla agotará tu vida. -necromancers staff=baston de nigromante -You see a cunningly beautiful staff. If you listen carefully you can hear its previous owners' souls screaming from within it.=Ves un bastón engañosamente hermoso. Si escuchas atentamente puedes oir las almas de sus anteriores dueños gritar desde dentro. + +enhanced mace=maza mejorada +You see an enhanced mace. The heavy attacking end makes it hard to balance.=Ves una maza mejorada. Su pesado extremo de ataque la hace difícil de equilibrar. + +flail=mangual +You see a flail. Swinging it in circles will tire you but it will be an effective weapon.= + +golden hammer=martillo de oro +You see a valuable golden hammer. This golden weapon may be worth a lot to someone. It has a slow rate of attack.=Ves un valioso martillo de oro. Este arma de oro puede valer muchísimo para alguien. Tiene un ritmo de ataque lento. + +golden mace=maza de oro +You see a shining golden mace. Despite looking ornamental, it is sharp enough to do some damage.=Ves una maza de oro brillante. A pesar de parece ornamental, está lo bastante afilada para hacer algún daño. + +hammer=martillo +You see a common hammer. It is heavy enough that you should be able to bludgeon your enemies with it, but only slowly=Ves un martillo común. Es bastante pesado por lo que deberías de ser capaz de aporrear a tus enemigos con él, pero sólo con lentitud. + +ice war hammer=martillo de guerra de hielo +You see an ice war hammer. The last owner must have been huge to wield it.= + +mace=maza +You see a mace, much neglected in years of use.=Ves una maza, muy descuidada en los años de uso. + +morning star=lucero del alba +You see a morning star. This is a very rare item indeed.= + rod of the gm=vara del DJ -You see a rod of the GM. This rod is reserved for those with special powers, be careful not to let it fall into the wrong hands.=Ves una vara del DJ. Esta vara se reserva a aquellos con poderes especiales, ten cuidado de no dejar que caiga en las manos equivocadas. +You see a rod of the GM. This rod is reserved for those with special powers, be careful not to let it fall into the wrong hands.= + +skull staff=bastón de calavera +You see a rare skull staff. It appears mystical but will work like any other staff.=Ves un bastón de calavera. Parece místico pero funcionará como cualquier otro bastón. + +staff=bastón +You see a staff. This is a seldom seen or used weapon.=Ves un bastón. Ésta es un arma que rara vez se ve o se usa. + +ugmash=ugmash +You see a huge ugmash. It can attack with a faster rate than many other clubs.=Ves un enorme ugmash. Puede atacar a un ritmo más rápido que muchos otros garrotes. + +vulcano hammer=martillo de vulcano +You see a vulcano hammer. It's said to be a weapon of a God, but attacks with a snail like pace.=Ves un martillo de vulcano. Se dice que es el arma de un dios, pero ataca al ritmo de un caracol. + +war hammer=martillo de guerra +You see a huge war hammer. It seems strong but is so heavy that you can only lift it to attack every so often.= + + +## containers + +keyring=llavero +You see a keyring.=Ves un llavero. + empty sack=saco vacío You see an empty sack. It will not stand up, unless you fill it first.=Ves un saco vacío. No se mantendrá en pie, a menos que lo llenes primero. + flask=frasco +You see a flask. It's good for storing medicine.= + +eared bottle=botella con asas +You see an eared bottle. It is empty, someone drank the contents.=Ves una botella con asas. Está vacía, alguien se bebió su contenido. + +slim bottle=botella estrecha +You see a slim bottle. It is empty, someone drank the contents.=Ves una botella estrecha. Está vacía, alguien se bebió su contenido. + +fat bottle=botella gruesa +You see a fat bottle. It is empty, someone drank the contents.=Ves una botella gruesa. Está vacía, alguien se bebió su contenido. + +empty goblet=copa vacía +You see an empty goblet. You wonder what could it hold.= + +goblet=copa +You see a goblet. You look at its contents, and shiver at the blood inside.= + +vial= +You see a vial used in chemestry.= + + +## crystals + +red emotion crystal= +You see a red emotion crystal. It feels hot to the touch.= + +purple emotion crystal= +You see a purple emotion crystal. It feels cold to the touch.= + +yellow emotion crystal= +You see a yellow emotion crystal. It energizes you.= + +pink emotion crystal= +You see a pink emotion crystal. It almost feels soft.= + +blue emotion crystal= +You see a blue emotion crystal. While holding it your worries seem to disappear.= + + +## documents + +note=nota +You see a note.=Ves una nota. + +coupon=cupón +You see a coupon.=Ves un cupón. + +closed envelope=sobre cerrado + +opened envelope=sobre abierto + +sealed envelope=sobre sellado + +unsealed envelope=sobre sellado abierto + +assassins id=identificación de asesino +You see an assassin's ID. Perhaps this can be put to good use.=Ves una identificación de asesino. Quizá puedas hacer un buen uso de ella. + +map=mapa +You see a hand drawn map, but no matter how you look at it, nothing on it looks familiar.= + + +## drinks + +olive oil= +You see a bottle of olive oil. Do not drink it pure, it will make you feel sick!= + +vinegar= +You see a bottle of vinegar. Do not drink it pure, it will make you feel sick!= + +fierywater=aguardiente +You see a bottle of fierywater. Do not drink it pure, you would evaporate!=Ves una botella de aguardiente. No te la bebas pura, ¡Te evaporarías! + +mild koboldish torcibud=suave torcibud koboldiano +You see a bottle of mild koboldish torcibud. It will help you recover when you're all bruised and battered.=Ves una botella de suave torcibud koboldiano. Te ayudará a recuperarte cuando estés todo magullado. + +strong koboldish torcibud=fuerte torcibud koboldiano +You see a bottle of strong koboldish torcibud. It will help you recover when you're all bruised and battered.=Ves una botella de fuerte torcibud koboldiano. Te ayudará a recuperarte cuando estés todo magullado. + +vsop koboldish torcibud=torcibud koboldiano de estaca vieja muy especial +You see a bottle of VSOP koboldish torcibud, specially aged in oak casks wrapped by the darkness of a dungeon cellar. It will help you recover when you're all bruised and battered.=Ves un torcibud koboldiano de estaca vieja muy especial, especialmente envejecida en barricas de roble envueltas por la oscuridad de la bodega de una mazmorra. Te ayudará a recuperarte cuando estés todo magullado. + +apple juice=zumo de manzana +You see apple juice. On a hot summer day, it would taste great.=Ves zumo de manzana. En un día de verano caluroso, sabría estupendo. + +beer=cerveza +You see a beer. On a hot summer day, it would taste great.=Ves una cerveza. En un día de verano caluroso, sabría estupendo. + +wine=vino +You see a glass of red wine. It will quench your thirst.=Ves un vaso de vino tinto. Saciará tu sed. + +water=agua +You see a bottle of fresh spring water. It's really tasty and fresh.=Ves una botella de agua fresca de manantial. Es realmente sabrosa y fresca. + +pina colada=piña colada +You see a pina colada. It looks delicious but tastes dangerously strong!= + +tea=té +You see a lovely cup of tea.=Ves una encantadora taza de té. + +milk=leche +You see a small bottle of fresh milk.=Ves una pequeña botella de leche fresca. + +antidote=antídoto +You see an antidote, to cure you of poison and protect you for a while.=Ves un antídoto, para curarte de venenos y protegerte durante un rato. + +greater antidote=antidoto mayor +You see a greater antidote, to cure you of poison and protect you for a long while.=Ves un antidoto mayor, para curarte de venenos y protegerte durante un largo rato. + +mana= +You see an bottle of mana, to increase your mana rapidly.= + +poison=veneno +You see a bottle of poison. Don't drink it!=Ves una botella de veneno ¡No te la tomes! + +greater poison=veneno mayor +You see a greater poison. Don't drink it!=Ves un veneno mayor ¡No te lo tomes! + +deadly poison=veneno mortal +You see a deadly poison. Don't drink it!=Ves un veneno mortal ¡No te lo tomes! + +disease poison=veneno de enfermar +You see a disease poison. Be careful, it's wicked.= + +mega poison=mega veneno +You see a mega poison. This is some wicked poison.=Ves un mega veneno. Éste es un veneno malvado. + +twilight elixir=elixir del crepúsculo +You see a bottle of medicinal elixir.=Ves una botella de elixir medicinal. + +minor potion=poción menor +You see a minor potion. It's not much but may save you in a tight spot.=Ves una poción menor. No es mucho pero puede salvarte en una situación difícil. + +soup=sopa +You see a bowl of soup. Its contents fill you up.=Ves un plato de sopa. Su contenido te llena. + +fish soup=sopa de pescado +You see a bowl of fish soup. Its contents fill you up.=Ves un plato de sopa de pescado. Su contenido te llena. + +potion=poción +You see a potion. Take it to battle and you may survive longer.=Ves una poción. Llevatela a la batalla y puedes sobrevivir por más tiempo. + +greater potion=poción mayor +You see a greater potion, invaluable in battle.=Ves una poción mayor, inestimable en la batalla. + +mega potion=mega poción +You see a mega potion. It strengthens greatly.=Ves una mega poción. Te fortalece en gran medida. + +love potion=poción de amor +You see a love potion. It looks powerful so take care to use it carefully!=Ves una poción de amor ¡Parece potente así que ten cuidado de usarla con precaución! + +sedative= +You see a sedative. It's effects can protect you from a shocked state.= + +ashen holy water= +A bottle of ashen holy water.= + +cobra venom= +You see a vial filled with cobra venom. Even in this small amount, it could be deadly if ingested.= + +antivenom= +You see a vial filled with antivenom.= + + +## flowers + +rhosyd=rhosyd +You see a beautiful and rare rhosyd flower.=Ves una bella y rara flor de rhosyd. + +rose=rosa +You see a single red rose. It smells heavenly.=Ves una sola rosa roja. + +lilia=lilia +You see a lilia, a single precious bloom.=Ves una lilia, una sola flor preciosa. + +daisies=margaritas +You see a bunch of daisies. They are cheap and cheerful!=Ves un ramo de margaritas ¡Son baratas y alegran! + +pansy=pensamiento +You see a pansy, so colorful and beautiful.=Ves un pensamiento, tan colorido y hermoso. + +zantedeschia=zantedeschia +You see a zantedeschia, a delicate bloom with the sweetest fragrance.=Ves una zantedeschia, una flor delicada con la más dulce de las fragancias. + + +## food + +apple=manzana +You see a nice shiny apple.=Ves una bonita y brillante manzana. + +purple apple= +You see a purple apple. It is loaded with memories= + +mauve apple= +You see a mauve apple. It is loaded with memories= + +black apple=manzana negra +You see a black apple. It must be a gift from lil Johnnnny. He's the guy with black items.=Ves una manzana negra. Debe de ser un regalo del pequeño Johnnny + +lemon= +You see a lemon. Could be an ingredient for the right chef...= + +banana= +You see a banana. Be careful of monkeys when you have them in your bag!= + +cherry=cereza +You see a cherry. Its tangy taste revives you a little.=Ves una cereza. Su sabor amargo te revive un poco. + +coconut=coco +You see a coconut. Luckily it's already cracked and you can drink from it.=Ves un coco. Afortunadamente ya está abierto y puedes beber de él. + +corn= +You see an ear of corn. It could be eaten raw, grilled or turned into flour... Your choice.= + +grapes= +You see a bunch of grapes. They look quite juicy and tasty.= + +olive= +You see a small ripe olive. It can be eaten or used to create olive oil.= + +pear= +You see a pear. Its lovely smell convinces you of taking it.= + +pineapple=piña +You see a tropical pineapple.=Ves una piña tropical. + +pomegranate= +You see a pomegranate. If you eat it, you will be in great shape soon.= + +watermelon= +You see a watermelon. It refreshes your throat during hot summer days.= + +artichoke=alcachofa +You see an artichoke. It can be an ingredient, or you can eat it.= + +broccoli=brocoli +You see a bunch of broccoli.=Ves un manojo de brocoli. + +carrot=zanahoria +You see a carrot. It can be an ingredient, or you can eat it.= + +cauliflower=coliflor +You see a fresh head of cauliflower.=Ves la cabeza de una fresca coliflor. + +zucchini= +You see a zucchini. It can be an ingredient, or you can eat it.= + +collard=col +You see a collard. It's rare and strangely magical.=Ves una col. Es rara y extrañamente mágica. + +garlic=ajo +You see some fresh garlic.=Ves un poco de ajo fresco. + +leek=puerro +You see a fresh leek.=Ves un puerro fresco. + +onion=cebolla +You see an onion.=Ves una cebolla. + +lettuce= + +spinach=espinacas +You see spinach. It is enriched with vitamins.=Ves espinacas. Está enriquecida con vitaminas. + +tomato=tomate +You see a tomato, put it in a salad or eat it.=Ves un tomate, ponlo en la ensalada o cometelo. + +egg=huevo +You see an egg.=Ves un huevo. + +button mushroom=champiñón común +You see a button mushroom. It can be an ingredient, or you can eat it.= + +porcini=seta calabaza +You see a porcini. It can be an ingredient, or you can eat it.= + +toadstool=seta venenosa +You see a toadstool. Beware!=Ves una seta venenosa ¡Ten cuidado! + +char=salvelinus +You see a char, with a fleshy pink belly.=Ves un salvelinus, con un vientre carnoso de color rosa. + +cod=bacalao +You see a cod.=Ves un bacalao. + +smoked cod= +You see a smoked cod.= + +mackerel=caballa +You see a mackerel.=Ves una caballa. + +perch=perca +You see a perch.=Ves una perca. + +roach=rutilo +You see a roach.=Ves un rutilo + +clownfish=pez payaso +You see a striped clownfish.=Ves un pez payaso a rayas. + +red lionfish=pterois rojo +You see a venomous coral reef red lionfish.=Ves un pterois rojo venenoso de los arrecifes de coral + +surgeonfish=pez cirujano +You see a bright blue surgeonfish.=Ves un pez cirujano de color azul brillante. + +trout=trucha +You see a trout.=Ves una trucha. + +smoked trout= +You see a smoked trout.= + +bread=pan +You see a loaf of bread. It is freshly baked and ready to eat.= + +pie=pastel +You see a meat and vegetable pie.=Ves un pastel de carne y verduras. + +apple pie=tarta de manzana +You see a delicious apple pie, made with only genuine ingredients.=Ves una deliciosa tarta de manzana, elaborada sólo con los ingredientes genuinos. + +cherry pie=tarta de cereza +You see a delicious cherry pie, made with only genuine ingredients.=Ves una tarta de cereza deliciosa, elaborada sólo con los ingredientes genuinos. + +fish pie=empanada de pescado +You see a fish and leek pie. It's not too stodgy so you can eat it faster than a meat pie.=Ves una empanada de pescado y puerros. No es demasiado pesada así que te la puedes comer más rápido que un pastel de carne. + +crepes suzette=crepe suzette +You see a crepes suzette topped with hot chocolate sauce.=Ves una crepe suzette cubierta con salsa de chocolate caliente. + +sandwich=sandwich +You see a ham and cheese sandwich.=Ves un sandwich de jamón y queso. + +smoked ham= +You see a smoked ham.= + +sugar=azúcar +You see a sack of raw sugar.=Ves un saco de azúcar no refinado. + +butter=mantequilla +You see some butter. It is an ingredient or can be eaten if you like.=Ves un poco de mantequilla. Es un ingrediente o se puede comer si quieres. + +honey=miel +You see a jar of sticky sweet honey. It's the clear runny kind.=Ves una jarra de miel dulce y pegajosa. Es de tipo fluído y claro. + +icecream=helado +You see a wafer cone with vanilla ice cream and chocolate flakes.= + +licorice=regaliz +You see some delicious licorice. Your mouth waters.=Ves un poco de delicioso regaliz. Se te hace la boca agua. + +hotdog=perrito caliente +You see what looks like a tasty hotdog on a bun.=Ves lo que parece ser un sabroso perrito caliente en un bollo. + +cheeseydog=perrito caliente con queso +You see what looks like a tasty cheeseydog on a bun.=Ves lo que parece ser un sabroso perrito caliente con queso en un bollo. + +cheese sausage=salchicha de queso +You see what looks like a tasty cheese sausage.=Ves lo que parece ser una sabrosa salchicha de queso. + +sausage=salchicha +You see what looks like a tasty sausage.=Ves lo que parece ser una sabrosa salchicha. + +tuna sandwich=sandwich de atún +You see what looks like a tuna sandwich.= + +chocolate shake=batido de chocolate +You see a scrumptious chocolate shake. Absolutely NO calories.=Ves un batido de chocolate para chuparse los dedos. Absolutamente SIN calorías. + +vanilla shake=batido de vainilla +You see a yummy vanilla shake. Absolutely NO calories.=Ves un sabroso batido de vainilla. Absolutamente SIN calorías. + +potato= +You see a potato.= + +habanero pepper= +You see a habanero pepper. Could be a very HOT ingredient for a decent meal...= + +pinto beans= +You see a bunch of pinto beans. An ingredient a chef will surely appreciate...= + +cheese=queso +You see some cheese. Eat it and see what happens.= + +chicken=pollo +You see a tasty leg of chicken.=Ves un sabroso muslo de pollo. + +chocolate bar=barrita de chocolate +You see an absolutely yummy chocolate bar.=Ves una barrita de chocolate absolutamente deliciosa. + +candycane= +You see a delicious candy cane.= + +greenmint= +You see a green mint.= + +gumdrops= +You see a mix of gum drops.= + +lemondrop= +You see a sweet and tangy lemon drop.= + +lollipop= +You see a lollipop.= + +peppermint= +You see a sweet, little peppermint.= + +taffy= +You see some ooey gooey taffy.= + +fairy cake=fairy cake +You see a luscious fairy cake with icing and sprinkles on top.=Ves un delicioso fairy cake con cobertura y fideos de chocolate por encima. + +ham=jamón +You see a juicy ham.=Ves un jugoso jamón. + +meat=carne +You see a piece of meat.=Ves un pedazo de carne. + +smoked meat= +You see a piece of smoked meat.= + +easter egg=huevo de pascua +You see a lovely chocolate easter egg. It's huge!=Ves un encantador huevo de pascua ¡Es enorme! + +small easter egg=huevo de pascua pequeño +You see a small chocolate easter egg. Yummy!=Ves un pequeño huevo de pascua de chocolate ¡Delicioso! + +grilled steak=filete a la parrilla +You see a fresh grilled steak. It smells awesome and is really juicy.=Ves un filete a la parrilla recién hecho. Huele fenomenal y está realmente jugoso. + +pizza=pizza +You see a tasty pizza, and hope they put extra cheese on it.=Ves una sabrosa pizza, y esperas que le hayan puesto extra de queso por encima. + + +## furniture + +picture in wooden frame= +You see a picture in a wooden frame= + + +## helmets + +leather helmet=casco de cuero +You see a leather helmet, it seems more like a hat than a defensive item.=Ves un casco de cuero, parece más un sombrero que un elemento defensivo. + +trophy helmet=casco trofeo +You see a Trophy Helmet. Those who were brave and finished the death match, win this helmet.= + +robins hat=sombrero de robin +You see a robins hat. It's cute but that's about it.=Ves un sombrero de robin. Es gracioso pero eso es todo. + +studded helmet=casco tachonado +You see a studded helmet, it should protect your head against cuts but perhaps not hard blows.=Ves un casco tachonado, debería de protegerte la cabeza de cortes pero quizá no de golpes fuertes. + +elvish hat= +You see an elvish hat. The elf craftmanship has made the leafy material stronger than one would think.= + +chain helmet=casco de cota de malla +You see a solid chain helmet, it will be excellent protection for your head.=Ves un sólido casco de cota de malla, será una excelente protección para la cabeza. + +viking helmet=casco de vikingo +You see a viking helmet. The previous owner wore it to many battles.=Ves un casco de vikingo. Su anterior dueño lo llevó consigo a muchas batallas. + +aventail=almófar +You see an aventail. It's a clever design.= + +blue helmet=casco azul +You see a brand new blue helmet.=Ves un casco azul nuevecito. + +red helmet=casco rojo +You see a red helmet, it reminds you of a jester's hat but you can be sure it has better protection than that.=Ves un casco rojo, te recuerda al sombrero de un bufón pero puedes estar seguro de que te proporcionará una protección mejor que esa. + +golden helmet=casco de oro +You see a heavy golden helmet. The thick metal should protect you against almost anything.=Ves un pesado casco de oro. El grueso metal debería de protegerte contra casi todo. + +horned golden helmet=casco de oro con cuernos +You see a horned golden helmet.=Ves un casco de oro con cuernos. + +shadow helmet=casco de sombra +You see a heavy shadow helmet. Instead of shining, it darkly gleams.=Ves un pesado casco de sombra. En lugar de brillar, emite destellos oscuros. + +xeno helmet= +You see a xeno helmet.= + +chaos helmet=casco del caos +You see a chaos helmet.=Ves un casco del caos. + +mainio helmet=casco de mainio +You see a strange mainio helmet. You can barely see when wearing it, but it protects your head very well.=Ves un extraño casco de mainio. Apenas puedes ver cuando lo llevas puesto, pero te protege muy bien la cabeza. + +magic chain helmet=casco de cota de malla mágico +You see a magic chain helmet.=Ves un casco de cota de malla mágico. + +liberty helmet=casco de la libertad +You see the liberty helmet. It's light and strong, you feel free wearing it.=Ves el casco de la libertad. Es ligero y resistente, te sientes libre al llevarlo puesto. + +black helmet=casco negro +You see a black helmet.=Ves un casco negro + +mithril helmet=casco de mithril +You see a mithril helmet.=Ves un casco de mithril. + +royal helmet= +You see a royal helmet.= + + +## herbs + +arandula=arandula +You see an arandula. It has medicinal properties, if the right person uses it.= + +kokuda=kokuda +You see a kokuda. It has medicinal properties, if the right person uses it.=Ves una kokuda. Tiene propiedades medicinales, si es usada por la persona adecuada. + +kekik=kekik +You see a kekik. It is a herb which can have healing properties.=Ves una kekik. Es una hierba que puede tener propiedades curativas. + +mandragora=mandrágora +You see a root of mandragora. It has medicinal properties, if the right person uses it.=Ves una raíz de mandrágora. Tiene propiedades medicinales, si es usada por la persona adecuada. + +sclaria=sclaria +You see the herb sclaria. The smell is calming.=Ves la hierba sclaria. Su olor es calmante. + +reindeer moss= +You see reindeer moss, something that grows only around Semos. It is quite a delicacy to reindeer, but extremely bitter to humans.= + + +## jewellery + +emerald=esmeralda +You see an emerald, a precious gemstone.=Ves una esmeralda, una gema preciosa. + +sapphire=zafiro +You see a sapphire, a precious gemstone.=Ves un zafiro, una gema preciosa. + +carbuncle=carbúnculo +You see a carbuncle, a precious gemstone related to the garnet.=Ves un carbúnculo, una gema preciosa relacionada con el granate. + +obsidian=obsidiana +You see a piece of obsidian, it's known as volcanic glass because it forms when lava cools rapidly. When used as a gemstone it may look jet black or silvery grey, depending on how it is cut.=Ves una pieza de obsidiana, es conocida como vidrio volcánico porque se forma cuando la lava se enfría rápidamente. Cuando se usa como gema puede parecer negro azabache o gris plateado, dependiendo de cómo se corte. + +amethyst= +You see an amethyst, a precious gemstone.= + +diamond=diamante +You see a diamond, not just a beautiful gem but also the hardest naturally occurring material.= + +black pearl=perla negra +You see a black pearl, so dark and shiny.=Ves una perla negra, tan oscura y brillante. + + +## keys + +dungeon silver key=llave de plata de la mazmorra +You see a silver dungeon key. Use it only if you are brave.=Ves una llave de plata de la mazmorra. Usala sólo si eres valiente. + +lich gold key=llave de oro del lich +You see a golden lich key. It will open the door to terrible things.=Ves una llave de oro del lick. Abrirá la puerta a cosas terribles. + +minotaur key=llave del minotauro +You see a fancy bronze key. It smells faintly of minotaur. Perhaps one dropped it?= + +nalwor bank key=llave del banco de nalwor +You see a key to the customer room of Nalwor Bank.=Ves una llave de la sala de clientes del Banco de Nalwork. + +kotoch prison key=llave de la prisión de kotoch +You see an ancient copper key, enscribed with something in Orcish.=Ves una antigua llave de cobre, grabada con algo en Orco. + +kanmararn prison key=llave de la prisión de kanmararn. +You see a key which matches the locks in the Kanmararn prison.=Ves una llave que coincide con las cerraduras de la prisión de Kanmararn. + +sedah gate key=llave de la puerta de sedah +You see a key for the gate to the imperial city of Sedah.=Ves una llave que abre la puerta que lleva a la ciudad imperial de Sedah. + +pet sanctuary key=llave del santuario de mascotas +You see a key for the pet sanctuary in Ados.=Ves una llave que abre el santuario de mascotas en Ados. + +house key=llave de la casa +You should not see this description=No deberías de poder ver esta descripción + +gate key= +You should not see this description=No deberías de poder ver esta descripción + +master key=llave maestra + +small key=llave pequeña +You see the key for Zara's row house in Ados.=Ves la llave de la row house de Zara en Ados. + + +## legs + +black legs=quijotes negros +You see a pair of black legs.=Ves un par de quijotes negros. + +blue legs=quijotes azules +You see a pair of shiny new blue legs.=Ves un par de quijotes azules nuevos y brillantes. + +chain legs=quijotes de cota de malla +You see a pair of well made chain legs. They should protect you against any attacks aimed low.=Ves un par de quijotes de cota de malla bien elaborados. Deberían de protegerte frente a cualquier ataque bajo. + +chaos legs=quijotes del caos +You see a pair of chaos legs. The strange colors confuse you.=Ves un par de quijotes del caos. Sus extraños colores te confunden. + +dwarvish legs= +You see a pair of dwarvish legs, designed by master craftsmen.= + +elvish legs=quijotes élficos +You see a pair of elvish legs.=Ves un par de quijotes élficos. + +golden legs=quijotes de oro +You see a pair of shining, strong golden legs.=Ves un par de quijotes de oro, resistentes y relucientes. + +jewelled legs=quijotes enjoyados +You see a beautiful pair of jewelled legs. A large red gem glints at you and they're encrusted all over with sapphires.=Ves un hermoso par de quijotes enjoyados. Una gema roja grande emite reflejos hacia ti y tienen incrustaciones de zafiro por todas partes. + +leather legs=quijotes de cuero +You see a pair of leather legs. They look new but they're poor quality.=Ves un par de quijotes de cuero. Parecen nuevos pero son de mala calidad. + +magic plate legs= + +mainio legs=quijotes de mainio +You see a pair of odd looking mainio legs. They are somewhat startling but they give you good protection.= + +mithril legs=quijotes de mithril +You see a pair of mithril legs. They will serve you well.=Ves un par de quijotes de mithril. Te servirán de mucho. + +red legs=quijotes rojos +A pair of red legs are in your grasp.=Un par de quijotes rojos están a tu alcance. + +royal legs= +You see a pair of royal legs.= + +shadow legs=quijotes de sombra +You see a pair of shadow legs. The weight of them is incredible.=Ves un par de quijotes de sombra. Su peso es increíble. + +stone legs= +You see a pair of stone legs, heavy and durable.= + +studded legs=quijotes tachonados +You see a pair of blood stained studded legs. You're not sure if the blood came from their last owner... or his enemies.= + +xeno legs=quijotes de xeno +You see a pair of xeno legs. They're very strong and look brand new.=Ves un par de quijotes de xeno. Son muy resistentes y parecen nuevecitos. + + +## miscs + +decent meal= +You see a decent meal for Groongo Rahnnt. Deliver it to him quickly!= + +bulb=bulbo +You see a bulb. It can be planted in fertile ground where it will thrive.= + +seed=semilla +You see a seed. It can be planted in fertile ground where it will thrive.= + +giant heart=corazón gigante +You see a giant heart. This proves that a giant was defeated, and has magical properties that you are not sure of.=Ves un corazón gigante. Ésto demuestra que un gigante fue derrotado, y tiene propiedades mágicas de las que no estás seguro. + +dice=dados +You see a set of dice. May lady luck be with you.=Ves un grupo de dados. Que la suerte te acompañe. + +cards=cartas +You see a deck of cards. Shuffle them well, to get a winning hand.= + +teddy=peluche +You see a teddy bear. It's soft and cuddly, and children love them.= + +rodent trap= +You see a rodent trap.= + +vampirette entrails=entrañas de vampiresa +You see some vampirette entrails. These guts prove that a vampirette was slain.= + +bat entrails=entrañas de murciégalo +You see some bat entrails, full of the blood of a living creature.=Ves unas entrañas de murciégalo, llenas de sangre de algún ser vivo. + +suntan cream=crema bronceadora +You see a tube of suntan cream and notice that the outside is slippery. A nice scent of coconut mixed with bannana wafts into the air from it.= + +marbles=canicas +You see some marbles. Boys will be boys.=Ves unas canicas. Son cosas de niños. + +canned tuna=atún en lata +You see what appears to be canned tuna. Too bad you don't have a can opener.= + +snowglobe=esfera de nieve +You see a snowglobe. It's so festive, it reminds you of Christmas!= + +bobbin=canilla +You see a bobbin for a sewing machine.=Ves una canilla para una máquina de coser. + +venom gland= +You see the venom gland of a giant king cobra. It is filled with deadly toxin.= + +pelt= +You see a pelt of animal skin. It's used to make clothes and leather armor.= + +leather thread= +You see a strand of sturdy leather thread.= + +unicorn horn= +You see a spiral unicorn horn. It is highly valued by traders and used in the creation of magical items.= + + +## missiles + +snowball=bola de nieve +You see a snowball. You can throw it at your friends or put it in your bag to keep your fish fresh. But be careful, there could be little stones in it.= + +vomit=vómito +You see a pile of vomit. Gross!=Ves un montón de vómito ¡Qué desagradable! + +shuriken=shuriken +You see a shuriken. You'll need to be close before you can use it as a missile. Stand square on, not diagonally, for the best results.=Ves un shuriken. Necesitarás estar cerca antes de que lo puedas usar como proyectil. Permanece recto, no inclinado, para obtener los mejores resultados. + +fire shuriken=shuriken de fuego +You see a fire shuriken. Throwing this flaming missile unleashes fiendish power.=Ves un shuriken de fuego. El lanzamiento de este proyectil en llamas desata un poder diabólico. + +wooden spear=lanza de madera +You see a wooden spear. You can attack at a distance with this primitive weapon. Stand square on, not diagonally, for the best results.=Ves una lanza de madera. Puedes atacar a distancia con este arma primitiva. Permanece recto, no inclinado, para obtener los mejores resultados. + + +## money + +money=dinero + + +## ranged + +wooden bow=arco de madera +You see a wooden bow. With this in one hand, and wooden arrows in the other, you may be able to attack from a distance.=Ves un arco de madera. Con esto en una mano, y flechas de madera en la otra, puedes ser capaz de atacar a distancia. + +longbow=arco largo +You see a longbow. Equipped with this, and a supply of arrows, you will have an effective ranged attack.=Ves un arco largo. Equipado con ésto, y con un surtido de flechas, conseguirás un efectivo ataque a distancia. + +composite bow=arco compuesto +You see a composite bow. It's better strung than most bows, for excellent ranged attack.=Ves un arco compuesto. Está mejor tensado que la mayoría de arcos, para proporcionar un excelente ataque a distancia. + +crossbow=ballesta +You see a crossbow. The attack is high but it has a very short range. What do you prefer?= + +hunter crossbow=ballesta de cazador +You see a hunter crossbow. You must decide if the high attack is worth the short range it has.=Ves una ballesta de cazador. Debes decidir si su elevado ataque compensa la corta distancia que cubre. + +mithril bow=arco de mithril +You see a light and strong mithril bow. Its impeccable workmanship affords incredible accuracy.=Ves un arco de mithril ligero y resistente. Su impecable elaboración permite una precisión increíble. + + +## relics + +skull ring=anillo de calavera +You see a skull ring.=Ves un anillo de calavera. + +amulet=amuleto + + +## resources + +wood=madera +You see some wood, fallen from a nearby tree.=Ves un poco de madera, caída de algún árbol cercano. + +sugar cane=caña de azúcar +You see a sugar cane. You can grind it for raw sugar.=Ves una caña de azúcar. Puedes molerla para obtener azúcar no refinado. + +grain=trigo +You see a sheaf of grain.=Ves una gavilla de trigo. + +flour=harina +You see a sack of flour. It can be used in recipes for pizzas and sandwiches.= + +iron ore=mineral de hierro + +coal=carbón +You see a black and shiny piece of stone coal. It stayed in the ground for million of years.=Ves un pedazo de piedra de carbón negro y brillante. Permaneció enterrado durante millones de años. + +wool=lana +You see wool. It was recently shorn.=Ves lana. Fue esquilada recientemente. + +yarn=hilo de lana +You see a ball of yarn. It was spun with care.=Ves un ovillo de lana. Fue hilado con sumo cuidado. + +cloth=tela +You see a roll of cloth. It is of first-class quality.=Ves un rollo de tela. Es de primera calidad. + +gold nugget=pepita de oro +You see a gold nugget. Its rich golden color shines, and it may be useful.=Ves una pepita de oro. Su vivo color dorado brilla,y puede resultar útil. + +mithril nugget=pepita de mithril +You see a mithril nugget. Its pale silvery color shines, and it may be useful.=Ves una pepita de mithril. Su pálido color plateado brilla, y puede resultar útil. + +iron bar= + +gold bar=barra de oro +You see a gold bar. It will make beautiful jewelry, or fetch a fine price.=Ves una barra de oro. Servirá para hacer hermosas joyas, o se pagará un buen precio por ella. + +mithril bar=barra de mithril +You see a mithril bar. It can be made into excellent armor, or fetch a fine price.=Ves una barra de mithril. Se puede elaborar una armadura excelente con ella, o se puede pagar un buen precio por ella. + +golden egg=huevo de oro +You see a valuable golden egg.=Ves un valioso huevo de oro. + +spotted egg=huevo con manchas +You see a spotted egg. They are said to be delicious.=Ves un huevo con manchas. Se dice que son deliciosos. + +silk gland=glándula de seda +You see a silk gland from a giant spider. Its contents are extremely valuable.=Ves una glándula de seda de una araña gigante. Su contenido es extremadamente valioso. + +silk thread=hilo de seda +You see a spool of silk thread, spun from the glands of a giant spider.= + +oil=aceite +You see a small can of oil.=Ves una pequeña lata de aceite. + +mithril thread=hilo de mithril +You see a spool of mithril thread, made from silk fused with mithril.=Ves un carrete de hilo de mithril, elaborado a partir de seda fundida con mithril. + +mithril fabric=tela de mithril +You see a couple yards of mithril fabric. It's very sparkly!=Ves un par de metros de tela de mithril ¡Emite muchos destellos! + +horse hair=pelo de caballo +You see some horse hairs.=Ves un poco de pelos de caballo. + +beeswax=cera de abeja +You see a piece of beeswax.=Ves un pedazo de cera de abeja. + +candle=vela +You see a candle in a candle stick.=Ves una vela en un candelero. + +charcoal= +You see charcoal, a component of carbon steel.= + + +## rings + +medicinal ring= +You see a medicinal ring. It may protect you from being poisoned when worn on the finger.= + +antivenom ring= +You see an antivenom ring. It has a good chance to protect you from poisoning when worn on the finger.= + +placid ring= +You see a placid ring. It may reduce the effects of being shocked when worn on the finger.= + +insulated ring= +You see an insulated ring that may protect from being shocked. It must be worn on the finger.= + +wedding ring=anillo de boda +You see a golden wedding ring, a symbol of love.= + +engagement ring=anillo de compromiso +You see a diamond engagement ring, a symbol of love (or a symbol of wealth?)=Ves un anillo de compromiso de diamante, un símbolo de amor (¿o un símbolo de riqueza?) + +emerald ring=anillo de esmeralda +You see an emerald ring, known as ring of life. Wear it, and you risk less from death.=Ves un anillo de esmeralda, conocido como el anillo de la vida. Llevalo, y arriesgarás menos al morir. + +turtle shell ring= +You see a turtle shell ring.= + +imperial ring= +You see an imperial ring. It is imbued with the strength of a king.= + +enhanced imperial ring= +You see an enhanced imperial ring. It eminates the auras of strength and defense.= + +ring of clarity= +You see a ring of clarity. You feel more aware while wearing it.= + + +## scrolls + +summon scroll=pergamino de invocación +You see a summon scroll. It summons a creature to aid in your adventures.= + +summon pet scroll= + +blank pet scroll= + +home scroll=pergamino del hogar +You see a home scroll, it will take you back to semos city.=Ves un pergamino del hogar, te llevará de regreso a la ciudad de semos. + +nalwor city scroll=pergamino de la ciudad de nalwor +You see a nalwor city scroll, it will take you back to nalwor city.=Ves un pergamino de la ciudad de nalwor, te llevará de regreso a la ciudad de nalwor. + +ados city scroll=pergamino de la ciudad de ados +You see an ados city scroll, it will take you back to ados city.= + +fado city scroll=pergamino de la ciudad de fado +You see a fado city scroll, it will take you back to fado city.=Ves un pergamino de la ciudad de fado, te llevará de regreso a la ciudad de fado. + +kirdneh city scroll=pergamino de la ciudad de kirdneh +You see a kirdneh city scroll, it will take you back to kirdneh city.=Ves un pergamino de la ciudad de kirdneh, te llevará de regreso a la ciudad de kirdneh. + +kalavan city scroll=pergamino de la ciudad de kalavan +You see a kalavan city scroll, it will take you back to kalavan city.=Ves un pergamino de la ciudad de kalavan, te llevará de regreso a la ciudad de kalavan. + +deniran city scroll= +You see a deniran city scroll, it will take you back to deniran city.= + +marked scroll=pergamino marcado + +invitation scroll=pergamino de invitación + +empty scroll=pergamino en blanco +You see an empty scroll. If used correctly it will return you to where you marked it at.=Ves un pergamino en blanco. Usado correctamente te llevará de regreso a donde lo marcaste. + +rainbow beans=haba del arco iris +You see a small pile of rainbow beans. One says something odd.=Ves un pequeño montón de habas del arco iris. Una dice algo raro. + +balloon=globo +You see a bright red balloon. You can use it to float high up into the clouds.=Ves un globo de color rojo brillante. Puedes usarlo para flotar en lo alto de las nubes. + +twilight moss=musgo del crepúsculo +You see a strange looking piece of moss. It looks like it could have hallucinogenic properties.=Ves un pedazo de musgo de aspecto extraño. Parece que podría tener propiedades alucinógenas. + + +## shields + +black shield=escudo negro. +You see a black shield. Its darkness will surely protect you.=Ves un escudo negro. Su oscuridad seguro que te protegerá. + +blue shield=escudo azul +You see a blue shield. It feels light in your hand but is strong enough for excellent protection.=Ves un escudo azul. Notas en tu mano que es ligero pero es lo bastante resistente como para proporcionar una excelente protección. + +buckler=broquel +You see a small buckler. It may protect you against swords and maces but against stronger weapons you do not trust it.=Ves un pequeño broquel. Puede protegerte frente a espadas y mazas pero frente a armas más potentes no te confíes. + +chaos shield=escudo del caos +You see a chaos shield. Its charming appearance will fool your enemies.=Ves un escudo del caos. Su encantadora apariencia engañará a tus enemigos. + +crown shield=escudo de la corona +You see a mighty crown shield. It is in perfect condition.=Ves un poderoso escudo de la corona. Esta en perfectas condiciones. + +elvish shield=escudo élfico +You see an elvish shield. It looks like one big tree leaf!=Ves un escudo élfico ¡Se parece a una gran hoja de árbol! + +enhanced lion shield=escudo de león mejorado +An enhanced lion shield glints at you. It will defend you well.=Un escudo de león mejorado emite destellos hacia ti. Te defenderá bien. + +golden shield=escudo de oro +You see a golden shield, could it be the ultimate in defense?=Ves un escudo de oro, ¿podría ser lo último en defensa? + +green dragon shield=escudo de dragón verde +You see a green dragon shield, scaly and strong.= + +lion shield=escudo de león +You see a valuable lion shield. It is heavy enough to defend you against strong attacks.=Ves un valioso escudo de león. Es lo bastante pesado como para defenderte frente a ataques potentes. + +magic plate shield=escudo mágico de placas de acero +You see a magic plate shield. It has a magical quality surrounding it.= + +mainio shield=escudo de mainio +You see a strange looking mainio shield. You have no idea what it's made of, but it seems to protect you well by distracting your enemies.=Ves un escudo de mainio de extraña apariencia. No tienes ni idea de lo que está hecho, pero parece que te protege bien al distraer a tus enemigos. + +mithril shield=escudo de mithril +You see a mithril shield. You will most surely be protected.=Ves un escudo de mithril. Casi con toda seguridad estarás protegido. + +plate shield=escudo de placas de acero +You see a solid plate shield. It is in good condition, and might be worth a little.=Ves un sólido escudo de placas de acero. Está en buenas condiciones, y podría valer bastante. + +red shield=escudo rojo +You see a red shield. It is a stunning shade of scarlet.=Ves un escudo rojo. Es de un imponente tono escarlata. + +royal shield= +You see a royal shield. It has a magical quality surrounding it.= + +shadow shield=escudo de sombra +You see a shadow shield. Rather than reflecting light, it seems to absorb it.=Ves un escudo de sombra. En lugar de reflejar la luz, parece absorberla. + +skull shield=escudo de calavera +The face of a skull scowls at you from this fearsome skull shield.=La cara de una calavera te frunce el ceño desde este temible escudo de calavera + +studded shield=escudo tachonado. +You see a studded shield. It's a little dented but seems robust enough.=Ves un escudo tachonado. Está un poco abollado peroparece bastante robusto. + +unicorn shield=escudo del unicornio +You see a unicorn shield. It's beautifully crafted and will give you excellent protection.=Ves un escudo del unicornio. Está bellamente elaborado y te proporcionará una protección excelente. + +wooden shield=escudo de madera +You see a wooden shield. It is made of cheap wood and heavily used. However, it still seems to offer you some kind of basic protection.=Ves un escudo de madera. Está elaborado a partir de madera barata y ha sido muy utilizado. Sin embargo, todavía parece proporcionar algún tipo de protección básica. + +xeno shield=escudo de xeno +You see a lightweight but strong xeno shield, in the colors of the creature it was looted from.=Ves un escudo de xeno ligero pero resistente, de los mismos tonos que la criatura a la que se le saqueó. + +ice shield= + + +## special + +lucky charm=amuleto de la suerte +You see a lucky charm. Some believe that it helps their karma in some way, but others think that is superstition.=Ves un amuleto de la suerte. Algunos creen que ayuda a su karma de algún modo, pero otros piensan que es una superstición. + +mithril clasp=cierre de mithril +You see a clasp made from mithril, it would provide the fastening for a cloak.=Ves un cierre elaborado a partir de mithril, te proporcionaría la fijación para una capa. + +mythical egg=huevo mítico +You see a mythical egg, but you do not know what it is for.= + +magical eggshells=cáscaras de huevo mágicas +You see shards from a mythical egg. They have magical properties.=Ves fragmentos de un huevo mítico. Tienen propiedades mágicas. + +golden gm token=ficha de dj de oro +You see a golden gm token. Does it bring you pride?= + +silvery gm token=ficha de dj de plata +You see a silvery gm token. Does it bring you pride?= + +bronze gm token=ficha de dj de bronce +You see a bronze gm token. Does it bring you pride?= + +four-leaf clover= +You see a lucky four-leaf clover. What are the chances of finding one!?= + + +## swords + +assassin dagger=daga de asesino +You see an assassin dagger, easy to pull out and use when needed.=Ves una daga de asesino, fácil de sacar y de usar cuando se necesite. + +biting sword=espada mordaz +The tip of this biting sword is chiseled to a lethal point. It will serve you well.= + +black sword=espada negra +You see a black sword. Its darkness will surely protect you.= + +broadsword=espada ancha +You see a mighty broadsword. Enemies will see their death.=Ves una poderosa espada ancha. Los enemigos verán su muerte. + +buster=buster +You see a buster, with its distinctive, oversized blade.=Ves una espada buster, con su distintiva hoja sobredimensionada. + +chaos dagger=daga del caos +You see a chaos dagger, it is very lightweight and sharp. It will heal you while hurting them.=Ves una daga del caos, es muy ligera y afilada. + +chaos sword=espada del caos +You see a chaos sword. Wielding it allows to hurt your foes and to heal you at the same time.= + +claymore=claymore +This claymore is very hard to lift as it is so heavy. It will be a good weapon if you can swing it.=Esta claymore es muy difícil de levantar ya que es muy pesada. + +dagger=daga +You see a dagger, it is little more than decorative but you can jab pretty fast with it.=Ves una daga, es poco más que decorativa pero puedes punzar bastante rápido con ella. + +dark dagger=daga oscura +You see a dark dagger. It's designed to be used with a fast motion.=Ves una daga oscura. Se ha diseñado para ser utilizada con un movimiento rápido. + +demon fire sword=espada de fuego de demonio +The demon fire sword, a horrible sword taken from hell's deepest dungeons.=La espada de fuego de demonio, una espada horrible sacada de las más profundas mazmorras del infierno. + +demon sword=espada de demonio +Demon skeletons return from hell with this demon sword.=Los esqueletos demonio regresan del infierno con esta espada de demonio. + +drow sword=espada drow +This is a genuine drow sword.=Esta es una genuina espada drow. + +elvish sword=espada élfica +This is an elvish sword. It is finely crafted.= + +fire sword=espada de fuego +Flames race along this fire sword as you wield it.=Las llamas corren a lo largo de esta espada de fuego mientras la esgrimes. + +golden blade=cuchilla de oro +You see the rare and precious golden blade. It can steal life from those you stab with it.=Ves la rara y preciosa cuchilla de oro. Puede robar la vida a aquellos que apuñales con ella. + +golden orc sword=espada de oro de orco +You see a golden orc sword, with its heavy and deadly appearance it seems also valuable.=Ves una espada de oro de orco, con su pesada y mortal apariencia parece tan valiosa. + +great sword=gran espada +This rare great sword is heavy and of good craftsmanship. It can only attack incredibly slowly.=Esta rara gran espada es pesada y de buena fabricación. + +hell dagger=daga del infierno +You see a hell dagger. Is the color that of the burning fires of Hell?=Ves una daga del infierno ¿Es ése el color de las llamas del infierno? + +ice sword=espada de hielo +You see an ice sword, the blade is lethally cold to the touch, and you know it is one of the best weapons you'll find.=Ves una espada de hielo, la hoja es letalmente fría al tacto, y sabes que es una de las mejores armas que vas a encontrar. + +imperator sword=espada imperator +You see a an imperator sword, crafted from you know not what.=Ves una espada imperator, elaborada a partir de ya sabes qué. + +immortal sword=espada inmortal +This immortal sword is a gift of gods to the chosen one. It is heavy and of exquisite craftsmanship.=Esta espada inmortal es un regalo de los dioses al elegido. Es pesada y de una elaboración exquisita. + +katana=katana +You see a valuable katana, with a lethal looking blade.=Ves una valiosa katana, con una hoja de apariencia letal. + +knife=cuchillo +You see a blunt knife which looks capable of little damage.=Ves un cuchillo desafilado que parece capaz de hacer poco daño. + +l hand sword=espada de mano i +You see l hand sword. It must be used with right hand sword.=Ves una espada de mano i. Debe usarse con una espada de mano derecha. + +night dagger=daga de la noche +You see a night dagger, to be used with stealth.=Ves una daga de la noche, para ser utilizada con sigilo. + +nihonto=nihonto +You see a samurai's nihonto sword with a razor sharp blade.=Ves una espada nihonto de samurai con una hoja tan afilada como la de una cuchilla. + +obsidian knife=cuchillo de obsidiana +You see a knife whose blade is crafted to a lethal edge from the finest obsidian.= + +orc sword=espada de orco +You see an orc sword which has a heavy and deadly appearance.=Ves una espada de orco que tiene una apariencia pesada y mortal. + +orcish sword=espada orca +This orcish sword is badly done and weighs a lot.=Esta espada orca está mal hecha y pesa un montón. + +r hand sword=espada de mano d +You see r hand sword. It must be used with a left hand sword.=Ves una espada de mano d. Debe usarse con una espada de mano izquierda. + +royal dagger= +You see the rare and precious royal dagger. It can steal life from those you stab with it.= + +scimitar=cimitarra +This scimitar catches the light as you look at it, it will be a powerful weapon.=Esta cimitarra atrapa la luz mientras la miras, sera un arma poderosa. + +short sword=espada corta +You see a well kept short sword which will be easy to carry as you travel.=Ves una espada corta bien conservada que será fácil de llevar cuando viajes. + +soul dagger=daga del alma +You see a soul dagger. It's so light and sharp that you can stab at a very fast rate.=Ves una daga del alma. Es tan ligera y afilada que puedes apuñalar a un ritmo muy rápido. + +sword=espada +You see a sharp sword which might even be worth a little.=Ves una espada afilada que podría incluso valer un poco. + +vampire sword=espada de vampiro +You see the vampire sword, which will suck life from those you attack with it.=Ves la espada de vampiro, que absorberá la vida de aquellos a los que ataques con ella. + +xeno sword=espada de xeno +You wield a xeno sword. Despite the great strength it is strangely light.=Tu esgrimes una espada de xeno. A pesar de su gran potencia es extrañamente ligera. + +training sword= +You see a wooden training sword not even useful for cutting butter. But it is light and easy to swing.= + + +## tokens + +arrow game token=ficha del juego de la flecha +You see a token, that when placed in the right spot could point you in the right direction.=Ves una ficha, que cuando se coloque en el lugar correcto podría señalarte la dirección correcta. + +o board token=ficha del tablero o +You see an O token.=Ves una ficha O + +x board token=ficha del tablero x +You see an X token.=Ves una ficha X + + +## tools + +food mill=molino de alimentos +You see a food mill. It is the traditional tool to mill food.=Ves un molino de alimentos. Es la herramienta tradicional para moler alimentos. + +sugar mill=molino de azúcar +You see a sugar mill. You can obtain sugar if you grind canes with it.=Ves un molino de azúcar. Puedes obtener azúcar si mueles cañas con él. + +scroll eraser=pergamino borrador +You see a scroll eraser. Put a marked scroll in the opposite hand to clean the scroll.=Ves un pergamino borrador. Pon un pergamino marcado en la mano opuesta para limpiar el pergamino. + +pestle and mortar=maza y mortero +You see a pestle and mortar. This is the traditional tool to pound herbs, food and other substances.=Ves una maza y un mortero. Esta es la herramienta tradicional para machacar hierbas, alimentos y otras sustancias. + +gold pan=sartén del oro +You see a gold pan. It is the traditional tool to prospect for gold.=Ves una sartén del oro. Es la herramienta tradicional para buscar oro. + +fishing rod=caña de pescar +You see a fishing rod. If you find a fishing spot you can catch fish with it.=Ves una caña de pescar. Si encuentra un lugar para pescar puedes capturar peces con ella. + +lamp= +You see a lamp.= + +magical scissors=tijeras mágicas. +You see a sparkling pair of magical scissors. Just think what they could cut!=Ves un par de tijeras mágicas centelleantes ¡Piensa sólo en lo que podrían cortar! + +magical needle=aguja mágica +You see a magical needle with a very sharp point.=Ves una aguja mágica con una punta muy afilada. + +pick=pico +You see a pick. It is a tool for excavating coal.= + +shovel= +You see a shovel, a tool for digging.= + +leather needle= +You see a heavy leather needle for working thick hide.= + +rotary cutter= +You see a rotary cutter. It can be used to cut up pizza. But perhaps it can be used on other things as well.= + +metal detector= +You may find buried treasures with this metal detector.= + +rope= +You see a sturdy rope.= + + +## whips + +venom whip= +You see a venom whip. Its thong has been saturated with cobra venom.= + + +# creatures names and descriptions + +## angel + +dark angel=ángel oscuro +You see a dark angel. He is an strong evil angel, and for now he is under cover of darkness.=Ves a un ángel oscuro. Es un ángel poderoso y malvado, y por ahora está al amparo de la oscuridad. + +dark archangel=arcángel oscuro +You see a dark archangel. After she fell from heaven her soul became as dark as she is now.= + +fallen angel=ángel caído +You see a fallen angel. When he turned away from good, he fell down from heaven.=Ves a un ángel caído. Cuando se apartó del bien, se cayó del cielo. + +baby angel=bebé angel +You see a baby angel. Will it ever get a chance to grow up?=Ves a un bebé angel ¿Tendrá alguna vez la oportunidad de hacerse mayor? + +angel=ángel +You see an angel. With his flame sword he guards the way and doesn't let you pass.=Ves a un ángel. Con su espada flamígera protege el camino y no te deja pasar. + +archangel=arcángel +You see an archangel. It is Heaven's most terrifying weapon, a fierce and absolute force of primordial creation.= + + +## animal + +crab=cangrejo +You see a little crab that comes from the beach, be careful of its pincers.=Ves un pequeño cangrejo que viene de la playa, ten cuidado con sus pinzas. + +deer=ciervo +You see a defenseless deer, do not have fear of it.=Ves un ciervo indefenso, no le tengas miedo. +You see a reindeer running freely, and wonder if he is one of Santa's special helpers.= + +bat=murciégalo +You see a bat, it will seek your blood, don't be distracted...=Ves un murciégalo, buscará tu sangre, no te distraigas... + +killer bat=murciégalo asesino +You see a killer bat which will suck your blood!=¡Ves un murciégalo asesino que te chupará la sangre! + +giant bat= + +giant killer bat= +You see a giant killer bat. As if small wasn't pesky enough, these giant ones are capable of taking down anyone who dares come before them.= + +piglet=cerdito +You see a piglet, a bit dirty.=Ves un cerdito, un poco sucio. + +boar=verraco +You see a boar, they are pretty wild!=Ves un verraco, ¡son bastante salvajes! + +bull=toro +You see a bull, run away!!!=Ves un toro, ¡sal corriendo! + +cow=vaca +You see a cow, taste her delicious milk.=Ves una vaca, prueba su deliciosa leche. + +goat=cabra +You see a goat, which is wild and lives in the mountain.=Ves una cabra, que es salvaje y vive en la montaña. + +ram=carnero +You see a ram, maybe you are able to shear it?=Ves un carnero, ¿quizá seas capaz trasquilarlo? + +horse=caballo +You see a horse, don't slap it or it will run away!=Ves un caballo, ¡no les des una palmada o saldrá corriendo! + +white horse=caballo blanco +You see a white horse, they love to stay with their brown friends.=Ves un caballo blanco, les gusta estar con sus amigos marrones. + +monkey=mono +You see a monkey, would you like to offer it a banana?=Ves un mono, ¿Te gustaría ofrecerle un plátano? + +fox=zorro +You see a fox, it becomes extinct!=Ves un zorro, ¡se esta extinguiendo! + +wolf=lobo +You see a wolf. It is wild and very hungry!=Ves un lobo ¡Es salvaje y está muy hambriento! + +big bad wolf=lobo grande y malo +You see a big bad wolf. It is really wild, hungry and really dangerous!=Ves un lobo grande y malo ¡Es verdaderamente salvaje, está hambriento y es realmente peligroso! + +lion=león +You see a lion, dangerous and hungry...=Ves un león, peligroso y hambriento... + +tiger=tigre +You see a tiger, which likes deer and human meat.=Ves un tigre, al que le gustan los ciervos y la carne humana. + +elephant=elephant +You see an elephant, a huge animal with lots of ham and meat. Are you sure that you want to attack it?=Ves un elefante, un animal enorme con un montón de jamón y de carne. + +bull elephant= +You see an aggressive bull elephant.= + +musth elephant= +You see a musth elephant. It is highly aggressive and unpredictable.= + +woolly mammoth= + +babybear=cachorro de oso +You see a babybear, isn't it sweet?=Ves un cachorro de oso, ¿a que es dulce? + +panda=panda +You see a panda which comes from an exotic land.=ves un panda que viene de una tierra exótica. + +bear=oso +You see a bear. You are lucky and found it awake.=Ves un oso. Has tenido suerte y lo has encontrado despierto. + +black bear=oso negro +You see a strong black bear which hibernates in winter.=Ves un fuerte oso negro que hiberna en invierno. + +polar bear= +You see a polar bear which lives in the icy desert. Beware! It can take you down with its powerful claws!= + + +## animal_aquatic + +kraken= +From the depths of the sea rises a Kraken!= + +neo kraken= +From the horrible darkness of the deep sea rises a giant NEO kraken!= + +shark= +A shark! Best move cautiously.= + + +## animal_fowl + +chick=pollito +You see a little chick, it doesn't like to be away from its mother.=Ves un pequeño pollito, no le gusta estar lejos de su madre. + +chicken=pollo +You see a chicken, isn't it nice?= + +dodo= +You see a dodo bird, aren't they supposed to be extinct?= + +mother hen=madre gallina +You see a mother hen, she will probably hurt you if you touch her sons.=Ves una madre gallina, probablemente te haga daño si tocas a sus hijos + +penguin=pingüino +You see a penguin, smart and silly.=Ves un pingüino, bobo y elegante + +pigeon=paloma +You see a pigeon, it loves the little seeds.=Ves una paloma, le encantan las semillas pequeñas. + + +## beast + +young beholder=joven beholder +You see a young beholder. His huge eye will find you everywhere!=Ves un joven beholder ¡Su ojo gigante te encontrará en cualquier lugar! + +beholder=beholder +You see a beholder which can see you very well with his huge eye...= + +elder beholder=beholder anciano +You see an elder beholder, his nasty eye will scare you.=Ves un beholder anciano, su desagradable ojo te asustará. + +gargoyle=gárgola +You see a gargoyle, You should think that it is a statue, but no, it is alive!=Ves a una gárgola, Pensarías que es una estatua, pero no, ¡está viva! + +elder gargoyle=gárgola anciana +You see an elder gargoyle, it is wise...=Ves a una gárgola anciana, es sabia... + +dark gargoyle=gárgola oscura +You see a dark gargoyle, do you feel the fear?=Ves a una gárgola oscura, ¿sientes el miedo? + +venom gargoyle=gárgola de veneno +You see a venom gargoyle, a hideous and poisonous creature.=Ves a una gárgola de veneno, una criatura horrible y venenosa. + +mimic= +You see a mimic. Its content might be different from what you expect.= + +snarfkin=snarfkin +You see a snarfkin, the favorite pet of wizards. Be careful, its claws are poisonous!=Ves a un snarfkin, la mascota favorita de los magos. Ten cuidado, ¡sus garras son venenosas! + +googon=googon +You see a googon that comes from the worst place in this world...Be careful this creature is a deadly killer.=Ves a un googon que viene del peor lugar de este mundo... Ten cuidado esta criatura es una asesina mortal. + +grobble monster=monstruo grobble +You see a grobble monster. You might find this under your bed, inside your closet, or within your darkest nightmares.= + +winged blurble=blurble alado + +thing=cosa +You see a thing. It looks like a very mutated human and is so scary that you think it has to come from another world.=Ves a una cosa. Parece un humano muy mutado y es tan espantoso que crees que ha venido de otro mundo. + + +## chess + +chaos pawn=peón del caos +You see a pawn for a game of chess. He will drop nothing if you kill him.=Ves un peón para una partida de ajedrez. No dejará caer nada si lo matas. + +chaos rook=torre del caos +You see a rook for a game of chess. He will drop nothing if you kill him.=Ves una torre para una partida de ajedrez. No dejará caer nada si la matas. + +chaos knight=caballo del caos +You see a knight for a game of chess. He will drop nothing if you kill him.=Ves un caballo para una partida de ajedrez. No dejará caer nada si lo matas. + +chaos bishop=alfil del caos +You see a bishop for a game of chess. He will not reward you if you kill him.=Ves un alfil para una partida de ajedrez. No te recompensará con nada si lo matas. + +chaos king=rey del caos +You see a king of a game of chess. He will reward nothing if you kill him.=Ves un rey para una partida de ajedrez. No te recompensará con nada si lo matas. + +chaos queen=reina del caos +You see a queen piece for a game of chess. She will reward nothing if you kill her.=Ves una pieza reina para una partida de ajedrez. No te recompensará con nada si la matas. + +madaram pawn=peón madaram +You see a pawn for a game of chess. It will reward nothing if killed.=Ves un peón para una partida de ajedrez. No te recompensará con nada si lo matas. + +madaram rook=torre madaram +You see a rook for a game of chess. It will scarcely reward you to kill it.=Ves una torre para una partida de ajedrez. Apenas te recompensará con algo si la matas. + +madaram knight=caballo madaram +You see a knight, a chess piece. He won't reward you if you kill him.=Ves un caballo, una pieza de ajedrez. No te recompensará con nada si lo matas. + +madaram bishop=alfil madaram +You see a bishop for a game of chess. It will reward you nothing if you slay it.=Ves un alfil para una partida de ajedrez. No te recompensará con nada si lo matas. + +madaram king=rey madaram +You see a king to play chess with, he will reward you nothing if you kill him.=Ves un rey para jugar al ajedrez con él, no te recompensará con nada si lo matas. + +madaram queen=reina madaram +You see a queen piece for a game of chess. She will reward nothing if you kill her.=Ves una pieza reina para una partida de ajedrez. No te recompensará con nada si la matas. + + +## demon + +violet avenger=vengador violeta + +devil queen=reina del diablo + +demon=demonio +You see a demon. He personifies evil.=Ves un demonio. Personifica el mal. + +imperial demon servant=sirviente demonio imperial +You see an imperial demon servant who carries out whims of his demon lords.= + +imperial demon lord=señor demonio imperial +You see an imperial demon lord. He holds the rank of General among demons, and very few out rank it in hell.= + +balrog=balrog +You see a huge balrog. He is slow hitting, but terribly strong as he stands towering above you.=Ves a un enorme balrog. Es lento en golpear, pero terriblemente potente mientras permanece de pie imponiendose por encima de ti. + +imp=diablillo +You see an imp. He may look a little bit cute, but don't forget he is one of the devil's servants!=Ves a un diablillo¡ Puede parecer un poquito lindo, pero no olvides que es uno de los siervos del demonio! + +winged blue imp=diablillo azul alado +You see a winged blue imp. It's endowed with the power of evil. His trident is able to poison even the bravest warriors.= + +water demon= + + +## dragon + +chaos green dragonrider=jinete de dragón verde del caos +You see a chaos green dragonrider. Don't misjudge him as to believe it's a normal green dragon, as it is controlled by a mysterious sorcerer seated on his back.= + +chaos red dragonrider=jinete de dragón rojo del caos +You see a chaos red dragonrider. He might look like a red dragon, but the sorcerer seated on his back guides him to give even more strength out.= + +green dragon=dragón verde +You see a green dragon. He looks very tall and strong.= + +bone dragon=dragon de hueso +You see a bone dragon. It's been said that there are creatures with enough will to live that their souls still cling to life even as their flesh and blood has failed them. This is living proof.=Ves a un dragón de hueso. Se dice que hay criaturas con la suficiente voluntad de vivir como para que sus almas todavía se aferren a la vida aún cuando su carne y su sangre les han abandonado. + +blue dragon=dragón azul +You see a blue dragon. It has a very beautiful blue skin which shimmers mysteriously in the light. But don't forget that it also has claws and teeth!=Ves a un dragón azul. Tiene un tono de piel azul muy bonito que brilla misteriosamente en la luz¡Pero no olvides que también tiene garras y dientes! + +red dragon=dragón rojo +You see into the emerald eyes of a red dragon. With these it can spot prey in the darkness. Its red scales serve it well, reflecting any light that shines on them blinding enemies. The scales are prized for their beauty, and difficult to obtain from such a ferocious beast.= + +black dragon=dragón negro +You see a black dragon. As you see this huge black creature you almost faint! If you concentrate you can feel the deep growling of it in your bones.=Ves un dragón negro ¡Al ver a esta enorme criatura negra casi te desmayas! + +flying golden dragon=dragón de oro volador +You see a flying golden dragon. As it spreads its mighty wings you shiver... this mystical creature seems to have much power in it!=Ves a un dragón de oro volador. A medida que extiende sus poderosas alas te estremeces... ¡esta criatura mística parece tener mucho poder en su interior! + +twin headed dragon=dragón de dos cabezas +You see a twin headed dragon. The two heads are staring at you with their four eyes!=Ves a un dragón de dos cabezas ¡Las dos cabezas te están mirando con sus cuatro ojos! + +rysin dragon= + + +## dwarf + +duergar=duérgar +You see a duergar. It is a close relative to dwarves but with a diabolically tainted blood.= + +duergar axeman=hachero duérgar + +elder duergar=duérgar anciano + +duergar elite=duérgar de élite + +duergar hero=héroe duérgar + +duergar wizard=mago duérgar + +black duergar=duérgar negro + +duergar king=rey duérgar + +dwarf=enano +You see a dwarf who works in the mine to find some iron for us.=Ves a un enano que trabaja en la mina para encontrar un poco de hierro para nosotros. + +dwarf guardian=guardián enano +You see a dwarf guardian who fights against the humans.=Ves a un guardián enano que lucha contra los humanos. + +elder dwarf=enano anciano +You see an elder dwarf, a mighty warrior tired of fighting.=Ves a un enano anciano, un poderoso guerrero cansado de luchar. + +hero dwarf=héroe enano +You see a hero dwarf. He is an old dwarf warrior who became a hero for fighting in many dwarf wars and he is very famous for his strength and brutality.=Ves a un héroe enano. Es un viejo guerrero enano que se convirtión en héroe por luchar en muchas guerras de enanos y es muy famoso por su fuerza y brutalidad. + +leader dwarf=líder de los enanos +You see a leader dwarf. He is the most mighty dwarf of his tribe so he enjoys much popularity there.=Ves a un líder de los enanos. Es el enano más poderoso de su tribu así que disfruta de una gran popularidad allí. + +giant dwarf=enano gigante +You see a giant dwarf. It is very hard for him to be a giant dwarf because some of the other dwarves don't really see him as one of them because of his height... But in his big heart he is a dwarf and in a battle he will fight against each enemy!=Ves a un enano gigante. Es muy duro para él ser un gigante por algunos de los otros enanos no le ven realmente como uno de los suyos por su estatura... Pero en su gran corazón se siente un enano y en la batalla luchará contra cada enemigo! + +Dhohr Nuggetcutter=Dhohr Nuggetcutter + +Lord Durin=Lord Durin +You see the mighty Lord Durin, an ancient dwarf who has led his race through countless battles.=Ves al poderoso Lord Durin, un antiguo enano que ha guiado a su raza a en incontables batallas. + +mountain dwarf=enano de montaña +You see a mountain dwarf. He likes earth, stones and rocks. Deep within the mountain, where no animal and no human has ever been, you can hear the sound of his pickaxe as he searches for gold and ore.=Ves a un enano de montaña. Le gusta la tierra, las piedras y las rocas. En lo profundo de la montaña, donde ningún animal ni ser humano ha estado nunca, puedes oir el sonido de su piqueta mientras busca mineral de oro y de hierro. + +mountain dwarf guardian=guardián enano de montaña +You see a mountain dwarf guardian. He has to watch out for enemies and guards the mountain dwarfs while they are doing their work.=Ves a un guardián enano de montaña. Tiene que estar alerta de los enemigos y protege las montañas enanas mientras ellos hacen su trabajo. + +mountain elder dwarf=enano de montaña anciano +You see a mountain elder dwarf. For many years he worked deep in the mountain and found much gold and ore in his life. Soon he will be too old to do this work but at the moment he is still a strong dwarf.=Ves a un enano de montaña anciano. Durante muchos años trabajó en lo profundo de la montaña y encontró mucho mineral de oro y de hierro en su vida. Pronto será demasiado viejo para hacer este trabajo pero por el momento todavía es un enano fuerte. + +mountain hero dwarf=héroe enano de la montaña +You see a mountain hero dwarf. Many, many dwarves admire him! He was a member of a dwarvish group which discovered a very big gold deposit!=Ves a un héroe enano de la montaña ¡Muchos, muchísimos enanos le admiran! ¡Fue miembro de un grupo de enanos que descubrió a depósito de oro muy grande! + +mountain leader dwarf=líder de los enanos de montaña +You see a mountain leader dwarf. He is responsible for the mountain dwarves and their work, and also for the organization of the guardian troops. But in serious cases he will also fight on his own!=Ves a un líder de los enanos de montaña. Es responsable de las montañas de los enanos y de sus trabajos, y también de la organización de las tropas guardianas ¡Pero en situaciones graves también luchará por sí sólo! + + +## elemental + +air elemental=elemental de aire +You see an air elemental and feel a fresh breeze past you.=Ves a un elemental de aire y sientes una fresca brisa que te atraviesa. + +djinn=djinn +You see a djinn. He isn't caught in a bottle or lamp so someone must have let him free and gave him the order to kill you.=Ves a un djinn. No está atrapado en una botella o lámpara así que alguien debe de haberle soltado y le dió la orden de matarte. + +nymph=ninfa +You see a nymph. She loves nature very much! As you take a look at her she feels disturbed in sun-bathing and talking to the birds, perhaps she was best left alone.=Ves a una ninfa ¡Le gusta muchísimo la naturaleza! Al echarle un vistazo se siente molestada en su tomar el sol y en su hablar con los pájaros, quizá habría sido mejor dejarla a solas. + +earth elemental=elemental de tierra +You see an earth elemental. The earth is quaking as it moves over the surface.=Ves a un elemental de tierra. La tierra tiembla mientras se mueve sobre su superficie. + +fire elemental=elemental de fuego +You see a fire elemental and hardly can stand the heat.=Ves a un elemental de fuego y apenas puedes soportar el calor. + +legendary ice elemental= +You see a Legendary Elemental of Ice...= + +ice elemental=elemental de hielo +You see an ice elemental and sense a shiver on your spine.=Ves a un elemental de hielo y sientes un escalofrío en tu columna vertebral. + +ice giant=gigante de hielo +You see an ice giant. His skin is covered with frozen hoarfrost and his breath feels like the cold north wind.=Ves a un gigante de hielo. Su piel está cubierta de escarcha helada y su aliento se siente como el frío viento del norte. + +water elemental=elemental de agua +You see a Water elemental which is made of water and various other liquids.= + +ent=ent +You see an ent. First you think it is a tree but you will get a surprise when it starts to walk!=Ves a un ent !Primero piensas que es un árbol pero te llevas una sorpresa cuando empieza a caminar! + +old ent=ent viejo. +You see an old ent. It has seen many years passing by and survived a lot of storms. You can see that it is very old because it has already lost all of its leaves and most of its bark is broken...=Ves a un viejo ent. Ha visto muchos años pasar y ha sobrevivido a muchas tormentas. Puedes ver que es muy viejo porque ya ha perdido todas sus hojas y la mayor parte de su corteza está rota... + +entwife=esposaent +You see an entwife. It is stronger than an ent and lives in a group in an ancient forest.=Ves a una esposaent. Es más fuerte que un ent y vive en grupo en un bosque antiguo. + + +## elf + +albino elf swordsman=espadachín elfo albino +You see an albino elf swordsman who is a professional in using swords. He can attack you from behind in a blink of an eye.= + +albino elf archer=arquero elfo albino +You see an albino elf archer. He is so sharp-eyed that he could hit a bee from a distance of 100 meters.= + +albino elf magician=mago elfo albino +You see an albino elf magician. He knows all the secrets of magic. You'd be better to not let him unleash his full power!= + +albino elf queen=reina elfa albina +You see an albino elf queen. She is the matriarch of the albino elf race and she will do everything to protect it.= + +albino elf king=rey elfo albino +You see an albino elf king. He is the patriarch of albino elves and won countless of battles with his powerful albino elf army.= + +child dark elf=niño elfo oscuro +You see a child dark elf. You should know that dark elves are already quite strong and intelligent when they are children. Don't think you can fight him so easily!=Ves a un niño elfo oscuro. Deberías saber que los elfos oscuros son ya bastante fuertes e inteligentes cuando son niños ¡No creas que puedes enfrentarte a él tan fácilmente! + +dark elf archer=arquero elfo oscuro +You see a dark elf archer. Dark elf archer's flawless aim can be fatal for those who dare to oppose them.= + +dark elf=elfo oscuro + +dark elf elite archer=arquero de élite elfo oscuro + +dark elf captain=capitán elfo oscuro + +dark elf knight=caballero elfo oscuro + +dark elf general=general elfo oscuro +You see a Dark Elf General. It is commanding the evil troops of Nalwor Caves against intruders.= + +dark elf wizard=mago elfo oscuro +Dark elf wizards are very powerful and dangerous. They are specialised in dark magic.= + +dark elf viceroy=virrey elfo oscuro + +dark elf ranger=explorador elfo oscuro + +dark elf sacerdotist=sacerdotisa elfa oscura + +dark elf admiral=almirante elfo oscuro + +dark elf master=Maestre elfo oscuro +You see a dark elf master. Beware of his high skills on magic and swordsmanship!= + +dark elf matronmother=matrona madre elfa oscura +Dusky and shrouded, this matriarch rules her clan with a soft touch and sharp fangs. An expert in venoms and poisons, you wouldn't ever want to turn your back on her.= + +elf=elfo +You see an elf which loves the forest and lives in peace.=Ves a un elfo al que le encanta el bosque y que vive en paz. + +militia elf=elfo de la milicia +You see a militia elf which trains hard to beat you!=¡Ves a un elfo de la milicia que se entrena duramente para vencerte! + +archer elf=arquero elfo +You see an archer elf which can do much damage with its wooden arrows.=Ves a un arquero elfo que puede hacer mucho daño con sus flechas de madera. + +soldier elf=soldado elfo +You see a soldier elf, a good partner of the militia elves.=Ves a un soldado elfo, un buen compañero de la milicia de los elfos. + +mage elf=maga elfa +You see a mage elf. She can feel pure magic when she stands outside in the forest and just frees her mind.=Ves a una maga elfa. Se puede sentir magia pura cuando se encuentra fuera en el bosque y simplemente libera su mente. + +commander elf=comandante elfo +You see a busy commander elf. He has control over the army of elves.=Ves a un ocupado comandante elfo. Tiene el control del ejército de los elfos. + +archmage elf=archimaga elfa +You see an archmage elf. She is pretty.=Ves a una archimaga elfa. Es guapa. + +elf sacerdotist=sacerdotisa elfa + +elf wizard=mago elfo +You see an elf wizard. He is a very wise elf who knows almost every kind of magic. He likes to use nature spells to make every plant and creature fertile, but he is also able to defend himself when he has to do.=Ves a un mago elfo. Es un elfo muy sabio que sabe casi cualquier tipo de magia. Le gusta usar hechizos de la naturaleza para hacer a cualquier planta o animal fértil, pero también es capaz de defenderse cuando tiene que hacerlo. + +elf bodyguard=guardaespaldas elfo + + +## giant + +amazoness giant=giganta amazona +You see an amazoness giant. She looks very beautiful but don't be deceived by that!=Ves a una giganta amazona ¡Parece muy hermosa pero no te dejes engañar por eso! + +giant=gigante +You look up into the face of a huge giant. His physical proportions and extraordinary strength should give you goosebumps.= + +elder giant=gigante anciano +You see an elder giant. For many years he lived alone and had to hide because he was hunted by humans! Now he is old and has decided not to hide any longer because he wants to see something else in his life.=Ves a un gigante anciano. Durante muchos años vivió sólo y tuvo que esconderse ¡porque era cazado por los humanos! Ahora es viejo y ha decidido no esconderse por más tiempo porque quiere ver otra cosa más en su vida. + +master giant= Maestre gigante +You see a master giant with dark black eyes. His blood pumps loudly into his heart.= + +black giant=gigante negro +You see a tall black giant. His armor and sword will hit you hard. Be prepared!= + +imperial general giant=general imperial gigante +You see an imperial general giant. He lurks in caves with his comrades to take you down.= + +kasarkutominubat=kasarkutominubat +You see kasarkutominubat, a creature not known to many, told it was a human champion long ago, now it resembles nothing but that, with a mask bearing thousands of souls on it and hands running with nothing but blood.= + + +## gnome + +gnome=gnomo +You see a gnome who lives in the mountains.=Ves a un gnomo que vive en las montañas. + +mage gnome=mago gnomo +You see a mage gnome, she cleans the dirty mountain.=Ves a una maga gnoma, ella limpia la sucia montaña. + +infantry gnome=gnomo de infantería +You see an infantry gnome who will protect his little town against the humans!=Ves a un gnomo de infantería que protegerá su pequeña aldea frente a ¡los humanos! + +cavalryman gnome=soldado de caballería gnomo +You see a cavalryman gnome who does long travels to search for gold.=Ves a un soldado de caballería gnomo que realiza largos viajes en busca de oro. + +giant gnome= + +giant gnomess= + + +## goblin + +goblin=goblin +You see a goblin, it is an evil and mischievous creature.=Ves a un goblin, es una criatura malvada y maliciosa. + +veteran goblin=veterano goblin +You see a veteran goblin, an old warrior...=Ves a un goblin veterano, un viejo guerrero... + +soldier goblin=soldado goblin +You see a soldier goblin, a young warrior.=Ves a un soldado goblin, un joven guerrero. + + +## golem + +dwarf golem=golem enano +You see a dwarf golem. A long time ago a dwarf got turned into a big rock by some mystical forces. To save their friend the other dwarves created a golem out of this rock! From this day the dwarf golem lives together with them.=Ves a un golem enano. Hace mucho tiempo un enano fue convertido en una gran roca por unas fuerzas místicas. Para salvar a su amigo los otros enanos crearon un golem ¡a partir de esta roca! Desde este día el golem enano convive con ellos. + +ice golem=golem de hielo +You see an Ice golem. Ice Golems are elementals made out of ice. You should watch out for its icy fists or you might get hurt.= + +stone golem=golem de piedra +You see a stone golem, it only exists to protect. What was it crafted for to protect, and what would one do if it lost its purpose?= + +wooden golem=golem de madera +You see a wooden golem. The scroll with ancient words in his head keeps it walking.=Ves a un golem de madera. El pergamino con las antiguas palabras en su cabeza lo mantiene caminando. + + +## human + +kalavan housewife=ama de casa kalavan +You see a kalavan housewife. She lives in Kalavan city and she is very angry with rude people who want to steal her food out of the kitchen and destroy her beautiful flower garden!= + +kalavan peasant=campesino kalavan +You see a kalavan peasant. He works in the fields around Kalavan city. As he heard there were strangers in the city he came to help the kalavan citizens in fighting the enemies!=Ves un campesino kalavan. Trabaja en los campos de alrededor de la ciudad de Kalavan. Cuando oyó que había extranjeros en la ciudad vino a ayudar a los ciudadanos de kalavan a luchar contra los enemigos! + +kalavan wisewoman=mujer sabia de kalavan +You see a kalavan wisewoman. Normally she sits in her small room and does some handworking but now she wants to have some action!=Ves a una mujer sabia de kalavan. Normalmente se sienta en su pequeña habitación y hace labores manuales pero ahora quiere tener algo de acción! + +kalavan citizen=ciudadano de kalavan +You see a kalavan citizen. He lives in kalavan city and tries to protect it from invaders!=Ves a un ciudadano de kalavan. Vive en la ciudad de kalavan ¡e intenta protegerla frente a los invasores! + +monk=monje +You see a monk. Monks are very calm and peaceful. They live alone among themselves, but they don't want to be interrupted by anyone.= + +darkmonk=monje oscuro +You see a Darkmonk. Darkmonks can control dark powers, and they will do anything to get you out of their way!= + +devil monk=monje del diablo +You see a devil monk. He is a member of a devil cult which practises black rituals.=Ves a un monje del diablo. Es miembro de un culto al diablo que practica negros rituales. + +littlewitch=brujita +You see a little witch. These little girls are witches and that makes them very dangerous.= + +littlewizard=pequeño mago +You see a little wizard. Although he is a child, he is already able to cast powerful spells.=Ves a un pequeño mago. Aunque es un crío, ya es capaz de lanzar poderosos hechizos. + + +## human_amazon + +amazoness archer=arquera amazona +You see an amazoness archer. She handles her bow quite well and her arrows are very dangerous when she shoots them at you out of the forest!=Ves a una arquera amazona ¡Maneja su arco bastante bien y sus flechas son muy peligrosas cuando las dispara hacia ti desde el bosque! + +amazoness archer commander=arquera comandante amazona +You see an amazoness archer commander. She is the leader of amazoness archers. Her bow skills are incredible and her arrows pierce everything.= + +amazoness bodyguard=guardaespaldas amazona +You see an amazoness bodyguard who will guarantee the safety to the people of Amazon island.= + +amazoness coastguard=guardacostas amazona +You see an amazoness coastguard. She protects the coasts of Amazon Island from intruders. She is not too happy to see you running in her island.= + +amazoness coastguard mistress=guardacostas Maestre amazona +You see an amazoness coastguard mistress. Even if they are women, these blue haired mistresses should not be underestimated.= + +amazoness commander=comandante amazona +You see an amazoness commander who is specialised in eliminating any strangers who dare to take a step to her island.= + +amazoness elite coastguard=guardacostas de élite amazona +You see an amazoness elite coastguard. When it is her shift to protect the island, you would just wish to have stayed at home.= + +amazoness hunter=cazadora amazona +You see an amazoness hunter. She creeps through the forest to hunt animals. But she doesn't like that you are in her hunting area!=Ves a una cazadora amazona ¡Se arrastra por el bosque para cazar animales ¡Pero no le gusta que estés en su zona de caza! + +amazoness vigilance=vigilante amazona +You see an amazoness vigilance. Her senses are well tuned, so you have to be very silent when you don't want her to hear you!=Ves a una vigilante amazona ¡Sus sentidos están muy desarrollados, así que tienes que ser muy silencioso cuando no quieras que te oiga! + +amazoness imperator=imperator amazona +You see an amazoness imperator. She is the emperor of Amazon island and has ruled it for decades and won't let you get past her very easily.= + + +## human_assassin + +bandit=bandido +You see a lean and mean bandit. He's out to get your life and purse!=Ves a un bandido preparado y listo para actuar ¡Hará lo que sea necesario para llevarse tu vida y tu dinero! + +disciple assassin=discípulo de asesino +You see a disciple assassin. He is quite young but he has learned to fight and kill already.=Ves a un discípulo de asesino. Es bastante joven pero ya ha aprendido a luchar y a matar. + +apprentice assassin=aprendiz de asesino +You see an apprentice assassin. He has been taught some very awesome moves and methods, so he is already able to kill an enemy almost perfectly!=Ves a un aprendiz de asesino. Le han enseñado algunos movimientos y métodos muy impresionantes, así que ya es capaz de matar a un enemigo casi perfectamente! + +hunter=cazador + +assassin=asesino +You see an assassin. He is very good at killing his victims silently without being seen by anyone.=Ves a un asesino. Es muy bueno matando a sus victimas silenciosamente sin ser visto por nadie. + +ninja=ninja +Your keen eyes made you able to see this fast ninja. Prepare for a fight!= + +samurai=samurai +If this samurai failed to uphold his honor, he could only regain it by performing seppuku.= + +shadows assassin=asesino de las sombras +You see a shadows assassin. He knows how to become one with the shadows and to move in the dark without being seen or making any sound.=Ves a un asesino de las sombras. Sabe como hacerse uno con las sombras y moverse en la oscuridad sin ser visto o hacer ningún sonido. + +master assassin=Maestre asesino +You see a master assassin. He is a master of assassination! He is able to kill an enemy without letting him know that he is already there!=Ves a un Maestre asesino ¡Es un maestro del asesinato! ¡Es capaz de matar a un enemigo sin dejar que sepa que ya está allí! + + +## human_barbarian + +barbarian=bárbaro + +barbarian wolf=lobo bárbaro + +barbarian elite=bárbaro de élite + +barbarian priest=sacerdote bárbaro + +barbarian chaman=chamán bárbaro + +barbarian leader=líder bárbaro + +barbarian king=rey bárbaro + + +## human_blordrough + +blordrough quartermaster=intendente de blordrough +You see a man who gave up his life as a puppet of the Blordrough army, all for the love of dragons. He is wonderfully happy.= + +blordrough corporal=cabo de blordrough +You see a man who feels his past indicates how he should be treated now but desperately wishes to exercise his intelect in a game of chess.= + +blordrough storm trooper=soldado de asalto de blordrough +You see a man who is but a fraction of his former glory as one of the most feared foes of Faiumoni. Now, his main concern is keeping his house clean and tidy.= + +blordrough soldier= +You see a man who is fast and strong.= + +blordrough elite= +You see a man who is aging, but he knows how to fight.= + +blordrough infantry= +You see a man who has flaming red hair and red beady eyes.= + +blordrough captain= +You see a seasoned warrior.= + +blordrough general= +You see a lean, mean, fighting machine.= + + +## human_cannibal + +cannibal woman=mujer caníbal +You see a cannibal woman. She wants to make a soup out of your bones!=Ves a una mujer caníbal ¡Quiere hacer una sopa con tus huesos! + +cannibal=caníbal +You see a cannibal. He hunts you for cooking and eating your fresh meat! It's useless to tell him that your flesh is not good, better fight him or run away!=Ves a un caníbal. Te caza para cocinar y comerse tu carne fresca! + +elder cannibal=caníbal anciano +You see an elder cannibal. For years it has eaten humans. It will not stop until its hunger is satisfied.= + +cannibal warrior= +You see a cannibal warrior.= + + +## human_chaos + +chaos soldier=soldado del caos +You see a chaos soldier. Chaos soldiers are servants of the evil. Killing you is one of their evil plans.= + +chaos warrior=guerrero del caos +You see a chaos warrior. This chaotic creature is fighting with a big blade to slay his enemies.= + +chaos commander=comandante del caos +You see a chaos commander who is working on an evil plan. You should take care of him before he fulfills his duty.= + +chaos sorcerer=hechicero del caos +You see a chaos sorcerer. Chaos sorcerers will cast some evil spells on you if you don't obey them.= + +chaos dragonrider=jinete de dragón del caos +You see a chaos dragonrider. He is very well trained in dragon riding, but he can also fight well on the ground.=Ves a un jinete de dragón del caos. Está muy bien entrenado en montar a dragón, pero también puede luchar bien en el suelo. + +chaos lord=señor del caos +You see a chaos lord who is one of the strongest chaos creatures in Faiumoni. You should prepare well before attacking him.= + +chaos overlord=gran señor del caos +You see a chaos overlord. It is him who directs the creation of evil plans and gives orders to all chaotic creatures which exist.= + + +## human_imperial + +imperial defender=defensor imperial +You see an imperial defender. He and his comrades won't let you walk into their territory easily.= + +imperial veteran=veterano imperial +You see an imperial veteran. He fought in many battles and wars. Now he is old, but over the years he always looked for a new enemy to fight against.=Ves a un veterano imperial. Luchó en muchas batallas y guerras. Ahora es viejo, pero a lo largo de los años siempre ha buscado un nuevo enemigo contra el que luchar. + +imperial archer=arquero imperial + +imperial priest=sacerdote imperial +You see an imperial priest. The church has fallen out of favor with the citizens as of late, but this imperial priest still clings to the faith.= + +imperial elite guardian=guardián de élite imperial +You see an Imperial Elite Guardian. He is a very well trained guardian and he will protect his environment until the end.= + +imperial scientist=científico imperial +You see an imperial scientist. He is quite clever but also a little bit crazy and unfortunately he uses his intelligence for evil experiments.=Ves a un científico imperial. Es bastante listo pero también un poquito loco y desafortunadamente usa su inteligencia para experimentos malvados. + +imperial high priest=sumo sacerdote imperial +You see an imperial high priest who's troubled by the actions of the imperial science department. Be careful, he might take those frustrations out on you!= + +imperial archer leader=líder arquero imperial + +imperial elite archer=arquero de élite imperial + +imperial leader=líder imperial +You see a well dressed imperial leader. Its troops will try to dash you.= + +imperial knight=caballero imperial + +imperial chief=jefe imperial + +imperial commander=comandante imperial + +imperial general=general imperial +You see an imperial general with a huge scar above his eye. He is still strong, don't think that he will not see you!= + +emperor dalmung=emperador dalmung +You see emperor dalmung who stands before you. Once a powerful warlock trained by a mighty magician, but he disappeared decades ago. Now it seems he's in league with Ivan Abe!= + + +## human_madaram + +madaram archer=arquero madaram + +madaram peasant=campesino madaram + +madaram trooper=soldado de asalto madaram + +madaram soldier=soldado madaram + +madaram healer=sanador madaram + +madaram axeman=hachero madaram + +madaram queen=reina madaram + +madaram hero=héroe madaram + +madaram windwalker=windwalker madaram + +madaram cavalry=caballería madaram + +madaram stalker=acechador madaram + +madaram buster blader=buster blader madaram + + +## human_mithrilbourgh + +mithrilbourgh soldier=soldado de mithrilbourgh + +mithrilbourgh archer=arquero de mithrilbourgh + +mithrilbourgh knight=caballero de mithrilbourgh + +mithrilbourgh elite archer=arquero de élite de mithrilbourgh + +mithrilbourgh sergeant=sargento de mithrilbourgh + +mithrilbourgh lieutenant=lugarteniente de mithrilbourgh + +mithrilbourgh colonel=coronel de mithrilbourgh + +mithrilbourgh wizard=mago de mithrilbourgh + +mithrilbourgh general=general de mithrilbourgh +You see a mithrilbourgh general. Some call him Hawkeyes. He cast his gaze over the city walls and saw you coming from miles away.= + + +## human_risecia + +risecia thug=matón risecia +You see a risecia thug, stay away from him!=Ves a un matón risecia, ¡mantente alejado de él! + +risecia archer=arquero risecia +You see a risecia archer, just one of the warriors who wants to protect his chief.=Ves a un arquero risecia, sólo uno más de los guerreros que quieren proteger a su jefe. + +risecia swordsman=espadachín risecia +You see a risecia swordsman, the blade of his sword will cut your head!=Ves a un espadachín risecia, ¡la hoja de su espada te cortará la cabeza! + +Chief Falatheen of the Risecia=Jefe Falatheen de los Risecia +You see the Chief Falatheen of the Risecia, he doesn't want to die! His little warriors protect him against invaders.=Ves al Jefe Falatheen de los Risecia, ¡no quiere morir! Sus pequeños guerreros le protegen frente a los invasores. + + +## humanoid + +robot aruthon=robot aruthon + +dark aruthon=aruthon oscuro + +leprechaun=leprechaun +You see a leprechaun, you would be lucky if you found his treasure.=Ves a un leprechaun, tendrías suerte si encontrases su tesoro. + +littlefairy=hadita +You see a little fairy, which is magical and nice.=Ves a una hadita, que es mágica y preciosa. + +clurichaun=clurichaun +You see a clurichaun. He is rich, but you don't know if you are able to find his gold!=Ves a un clurichaun. Es rico, pero no sabes si serás capaz de encontrar su oro! + +brain ahouga=cerebro ahouga +You see a brain ahouga, a very strange creature only living in your dreams!=Ves a un cerebro ahouga, ¡una criatura muy extraña que sólo vive en tus sueños! + +blue mohiko=mohiko azul +You see a blue mohiko. A brown alien with a large blue mohawk.= + +red roohako=roohako rojo +You see a red roohako. It is coming for you in your deepest dreams.= + + +## hybrid + +arachne=arachne +You see Arachne, a horrid half woman half spider. With so many legs she can hit you very fast, and her poisonous bite is fierce.=Ves a Arachne, un ser horrible mitad mujer mitad araña. Con tantas piernas puede golpearte muy rápido, y su mordedura venenosa es feroz. + +frogman=hombre-rana +You see a frogman which lives in a lake which isn't very deep.=Ves a un hombre-rana que vive en un lago no muy profundo. + +elite frogman=hombre-rana de élite +You see an elite frogman. His huge eyes let you shiver!= + +wizard frogman=mago hombre-rana +You see a mighty wizard frogman. His wand and magical cloak show his wisdom and power.= + +minotaur=minotauro +You see a minotaur. He escaped from his labyrinth and is very angry now!=Ves a un minotauro ¡Ha escapado de su laberinto y ahora está muy enfadado! + +minotaur king=rey minotauro +You see a Minotaur King. He doesn't have to escape from his labyrinth to be very angry...= + +naga=naga +You see a naga. She awaits unwary victims to whom she may give her deadly kiss.= + +high naga=naga suprema + +armed naga=naga con brazos + +lamia= + +ratman=hombre rata +You see a ratman. He is a mutation that comes from old times.=Ves a un hombre rata. Es una mutación que procede de tiempos remotos. + +ratwoman=mujer rata +You see a ratwoman. She is a mutation of women with the rats in the century XVIII.=Ves a una mujer rata. Es una mutación de mujeres con ratas en el siglo XVIII. + +archrat=archirrata +You see an archrat. You will be distracted with its aura, be careful...=Ves una archirrata. Te distraerás con su aura, ten cuidado... + +sheepman=hombre oveja + +armored sheepman=hombre oveja blindado + +elder sheepman=hombre oveja anciano + +elite sheepman=hombre oveja de élite + +xenocium=xenocium + + +## insect + +killer bee= +You see a killer bee which will sting you to death!= + +tiny scarab= +You see a tiny scarab. It is an insect familiar to desert ecologies that will eat almost anything, including dung. Its hard carapace provides protection from the sun and being crushed, so don't think a little stomp will stop it.= + +water scarab= + + +## kobold + +kobold=kobold +You see a kobold. People say that it is a mythical spirit.=Ves a un kobold. La gente dice que es un espíritu mítico. + +soldier kobold=soldado kobold +You see a soldier kobold, he's protecting his king.=Ves a un soldado kobold, está protegiendo a su rey. + +archer kobold=arquero kobold +You see an archer kobold. It runs away from humans.=Ves a un arquero kobold. Sale corriendo de los humanos. + +veteran kobold=veterano kobold +You see a veteran kobold, it is mighty!=Ves a un veterano kobold, ¡es poderoso! + +leader kobold=líder kobold +You see a leader kobold, one of the mighty warriors.=Ves a un líder kobold, uno de los poderosos guerreros. + +giant kobold=kobold gigante +You see a giant kobold. Though generally playful it doesn't quite know its own strength. When it asks for a hug, it's best to decline that offer.= + + +## mutant + +cat woman=mujer gata +You see a cat woman. She's agile, stealthy, fast and sharp, so stay focused and don't get cut!= + +dark mutant=mutante oscuro + +glow monster=monstruo del resplandor +You see a glow monster. Its gleam in the dark sewers fightens you.= + +imperial experiment=experimento imperial +You see an imperial experiment which mirrors the fate of many of science departments test subjects. Its skin glows and standing before it taxes your body.= + +imperial mutant=mutante imperial + +poison shroom= +You see a toadstool... spitting poison at you?= + +werewolf=hombre lobo +You see a werewolf. Normally he is a human but at fullmoon nights he turns into a dangerous beast! His poison seems to last forever.=Ves a un hombre lobo. Normalmente es un humano pero ¡en las noches de luna llena se convierte en una bestia peligrosa! Su veneno parece durar para siempre. + + +## mythical_being + +mermaid= +You see a mermaid. They perfer their own company and are not too happy to see you here.= + +emerald mermaid= +You see an emerald mermaid.= + +amethyst mermaid= +You see an amethyst mermaid.= + +ruby mermaid= +You see a ruby mermaid.= + +sapphire mermaid= +You see a sapphire mermaid.= + +unicorn=unicornio +You see a rare unicorn. It is widely believed to be only a myth.=Ves un raro unicornio. En general se cree que es sólo un mito. + +white unicorn= + +black unicorn= + +golden unicorn= + +pegasus=pegaso +You see Pegasus, the winged horse. His name means Lightning and he carries bolts of Thunder.=Ves a Pegasus, el caballo alado. Su nombre significa Relámpago y lleva los rayos del Trueno. + +baby pegasus= + +bronze pegasus= + +ivory pegasus= + +ebony pegasus= + +centaur=centauro +You see a noble centaur, half man, half horse. He looks capable of great damage but thankfully seems to mean you no harm.= + +solar centaur= + +glacier centaur= + +centaur king= + + +## ogre + +ogre=ogro +You see an ogre, it is nude and rude!=Ves a un ogro, ¡está desnudo y es rudo! + +elder ogre=ogro anciano +You see an elder ogre, he's in the last moments of his life, take pity on him.=Ves a un ogro anciano, está en los últimos momentos de su vida, ten compasión de él. + +ogre soldier=soldado ogro +You see an ogre soldier, smelling like it didn't have had a bath for years. Ewww.=Ves a un soldado ogro, huele como si no se hubiese bañado durante años. Puaj! + +superogre=superogro +You see a superogre which belongs to the family of very material creatures, the Ogres. Ever since this one happened upon a peculiar helmet and has been revered among its peers. Take care, it throws a mean punch!= + + +## oni + +oni warrior=guerrero oni +You see an oni warrior. His purple skin color should not lull you into a false sense of security!= + +oni archer=arquero oni +You see an oni archer. His arrows will follow you everywhere for protecting his queen!= + +oni priest=sacerdote oni +You see a mysterious oni priest, uttering strange incantations.=Ves a un misterioso sacerdote oni, pronunciando extraños encantamientos. + +oni king=rey oni +You see the oni king. His power leads brave oni troops around his kingdom.= + +oni queen=reina oni +You see the oni queen. She supports her husband and takes an eye onto their kingdom while he conquers new land and fights on battlefields.= + + +## orc + +orc=orco +You see an orc which is noisy and silly.=Ves a un orco que es ruidoso y tonto. + +orc spearman=lancero orco +You see an orc spearman. Run away fast before a spear pierces you.=Ves a un lancero orco. Sal corriendo rápido antes de que una lanza te atraviese. + +orc hunter=cazador orco +You see an orc hunter. It it seeking for you!=Ves a un cazador orco ¡Te está buscando a ti! + +orc warrior=guerrero orco +You see an orc warrior which doesn't like you searching in the mountain.=Ves a un guerrero orco al que no le gusta que andes buscando en la montaña. + +orc chief=jefe orco +You see an orc chief which is too busy to attend to you!=Ves a un jefe orco ¡que está demasiado ocupado para atenderte! + +mountain orc=orco de montaña +You see a mountain orc. Not very cunning but his robustness, stench and loudness could still overwhelm you!= + +mountain orc warrior=guerrero orco de montaña +You see a mountain orc warrior. Not very cunning but you should not underestimate his robustness and stench!= + +mountain orc hunter=cazador orco de montaña +You see a mountain orc hunter. He's in search for raw meat... You could be his next lunch!= + +mountain orc chief=jefe orco de montaña +You see a mountain orc chief. He's proud, loud and reeks like a thousand orcs together...= + +golden orc= + + +## reptile + +grass snake=serpiente de hierba +You see a grass snake which is quite dangerous.=Ves una serpiente de hierba que es bastante peligrosa. + +snake=serpiente +You see a snake, it came from the forest to poison you!=Ves una serpiente, ¡vino desde el bosque a envenenarte! + +cobra= + +king cobra= +You see a king cobra. It is extremely venomous.= + +caiman=caimán +You see a caiman, which is hidden in the water.=Ves un caimán, que está escondido en el agua. + +crocodile=crocodilo +You see a crocodile, it arises from the deep waters in the rivers.=Ves un crocodilo, surge de las aguas profundas de los ríos. + +turtle= +You see a turtle swimming quietly in the water. It doesn't want to be disturbed.= + + +## rodent + +mouse=ratón +You see a small mouse that seems to be very hungry.=Ves un pequeño ratón que parece estar muy hambriento. + +rat=rata +You see a small rat that seems to be extremely hungry.=Ves una pequeña rata que parece estar extremadamente hambrienta. + +caverat=rata de cueva +You see a caverat which is dirty and loves the dungeons.=Ves una rata de cueva que es sucia y le encantan las mazmorras. + +venomrat=rata de veneno +You see a venomrat, extremely poisonous.=Ves una rata de veneno, extremadamente venenosa. + +zombie rat=rata zombi +You see a hungry zombie rat and it doesn't like to see you.=Ves una hambrienta rata zombi y a ella no le gusta verte a ti. + +razorrat=rata de cuchilla +You see a razorrat, its noise will make you crazy!=Ves una rata de cuchilla, ¡su ruído te hará perder la cabeza! + +giantrat=ratagigante +You see a giant rat. It seems like it survived from an experiment which went wrong.=Ves una rata gigante. Parece que haya sobrevivido a un experimento que salió mal. + +beaver=castor +You see a beaver. It likes to build dams in the river.=Ves un castor. Le gusta construir presas en el río. + + +## slime + +black slime=baba negra +You see a black slime, with a sticky trail behind it.=Ves una baba negra, que va dejando un rastro pegajoso. + +brown slime=baba marrón +You see a brown slime, sticky and hungry.=Ves una baba marrón, pegajosa y hambrienta. + +green slime=baba verde +You see a green slime, sticky and shiny.=Ves una baba verde, pegajosa y brillante. + +twilight slime=baba del crepúsculo +You see a twilight slime, so strange and beautiful. Why is it coming towards you? Runnnnnnnnn!=Ves una baba del crepúsculo, tan extraña y bella ¿Por qué se está acercando hacia ti? ¡Correeeeeeeee! + + +## spider + +spider=araña +You see a spider. It makes a giant spider web to trap you!=Ves una araña ¡Está haciendo una telaraña gigante para atraparte! + +poisonous spider=araña venenosa +You see a poisonous spider. Be careful! Its poison is very strong! It will make you very weak and can probably kill you!=Ves una araña venenosa ¡Ten cuidado! ¡Su veneno es muy fuerte! ¡Te debilitará y probablemente puede matarte! + +giant spider=araña gigante +You see a giant spider. It has very long legs which are quite dangerous.=Ves a una araña gigante. Tiene patas muy largas que son bastante peligrosas. + + +## troll + +cyclops=cíclope +You see a cyclops. It just has one eye.=Ves a un cíclope. Sólo tiene un ojo. + +troll=trol +You see a troll, be careful in his terrain.=Ves a un trol, ten cuidado en su terreno. + +red troll=trol rojo +You see a red troll, he's burning with anger.=Ves a un trol rojo, está quemando de ira. + +cave troll=trol de cueva + + +## undead + +ghost hound=perro fantasma +As you catch sight of its shaggy shape and gleaming evil eyes, you suddenly remember all the horror stories around the dreaded ghost hound!=Al avistar su forma peluda y sus malvados ojos brillantes, de repente recuerdas todas las historias de terror acerca del temido perro fantasma! + +death knight=caballero de la muerte +You see a death knight. Some time ago he fought in tournaments where his only aim was to kill as many enemies as possible.=Ves a un caballero de la muerte. Hace algún tiempo luchó en torneos donde su único objetivo era matar tantos enemigos como fuese posible. + +necrosophia=necrosophia +You see Necrosophia. She is a mighty beast, she will burn you with fire while you are disoriented by the rainbow beans.= + +green phantom=fantasma verde + + +## undead_lich + +lich=lich +You see a lich, a dark desolate creature which has been doomed to wander in endless turmoil, feeding on the souls of the righteous.=Ves a un lich, una criatura oscura solitaria que ha sido condenada a vagar en confusión sin fin, alimentándose de las almas de los justos. + +dead lich=lich muerto +You see a dead lich with his huge green and heavy cloak. Although he is dead and bony, he'll seek revenge for his too early passing and will always return fast and ruthless!= + +high lich=lich supremo +The terrible grinning skull of a high lich leers at you as it prepares to slaughter you in a myriad of magical ways.=La terrible sonrisa de la calavera de un lich supremo te mira de reojo al prepararse para matarte de una miríada de mágicas maneras. + + +## undead_mummy + +mummy=momia +You see a mummy which usually sleeps in a coffin.=Ves a una momia que suele dormir en un sarcófago. + +royal mummy=momia real +You see a royal mummy. You wonder what keeps this king's soul from finding peace.=Ves a una momia real. Te preguntas qué le impide al alma de este rey encontrar la paz. + + +## undead_skeleton + +skeleton=esqueleto +You see a skeleton which survives to get revenge.=Ves a un esqueleto que sobrevive para vengarse. + +tiny skelly=pequeño esqueletito +You see a tiny skelly. It is silly, little and evil, be careful with its poison...=Ves a un pequeño esqueletito. Es tonto, pequeño y malvado, ten cuidado con su veneno... + +warrior skeleton=guerrero esqueleto +You see a warrior skeleton, it's just a normal skeleton with a shield!=Ves a un guerrero esqueleto, ¡es sólo un esqueleto normal con un escudo! + +elder skeleton=esqueleto anciano +You see the bones of an old man. He lived to a ripe old age, and is sure to know a thing or two that separates him from all the vengeful skeletons that died young.= + +demon skeleton=esqueleto demonio +You see a demon skeleton. Demon skeletons have ascended from the underworld and they are going to take over this world. You really should slay them before it is too late!= + +gashadokuro=gashadokuro +A giant figure made of bone, known only as gashadokuro, towers before you. He is created from the bones of starving humans.=Una figura gigante hecha de hueso, conocida sólo como gashadokuro, se impone ante ti. Se ha creado a partir de los huesos de humanos muertos de hambre. + +fallen warrior=guerrero caído +You see a fallen warrior. Once he fought in great battles but now he has fallen to the depths of hell only to come back up to get his revenge.= + +fallen priest=sacerdote caído +You see a fallen priest. He was once just a regular human priest, until the dark powers corrupted him and turned him to the dark side.= + +fallen high priest=sumo sacerdote caído +You see a fallen high priest. It is manifested through the dark forces seized of this world.= + + +## undead_specter + +ghost=fantasma +You see a ghost, don't be afraid! It doesn't seem to be evil.=Ves un fantasma, ¡no tengas miedo! No parece ser malvado. + +death=muerte +You see Death. Do you have the will to stare him in the face? Today he's not in the mood to bargain with your soul.=Ves a la Muerte ¿Tendrás el valor de mirarla a la cara? Hoy no está de humor para negociar con tu alma. + +black death=muerte negra +You see a black death. With his scythe he reaps your soul and then he takes it over the river where it has to stay until judgement day arrives.= + +golden death=muerte de oro +You see the golden death. He came to take your soul away to pay for all your sins.=Ves a la muerte de oro. Vino a llevarse tu alma para que pague por todos tus pecados. + +invisible man=hombre invisible +You see nothing but the landscape. As you stare at the point where you think you have seen something, you suddenly see the slight contour of a man!=No ves nada excepto el paisaje. Al mirar fijamente al punto donde crees haber visto algo, de repente ¡ves el ligero contorno de un hombre! + +incorporeal armor=armadura incorpórea +You see an incorporeal armor. You are quite surprised as it walks towards you because there is nobody in it.=Ves una armadura incorpórea. Te sorprende bastante al caminar hacia ti porque no hay nadie dentro de ella. + + +## undead_vampire + +vampire bride=novia vampira +You see a vampire bride. She was resurrected from the dead by a wicked vampire lord.=Ves a una novia vampira. Fue resucitada de entre los muertos por un malvado señor vampiro. + +vampirette=vampiresa +You see a Vampirette. Beware of its sharp teeth! She wants to drink your blood and turn you into a vampire!= + +vampire lord=señor vampiro +You see a vampire lord. Be careful, he is after your blood!=Ves a un señor vampiro. Ten cuidado, ¡va tras tu sangre! + + +## undead_zombie + +bloody zombie=zombi sangriento +You see a bloody zombie. Can you see the drops of blood which fall from his body?= + +zombie=zombi +You see a zombie. It woke up just to take revenge, be silent.=Ves a un zombi. Se despertó solo para vengarse, estate en silencio. + +headless monster=monstruo sin cabeza +You see a headless monster, how can he hear that we come to him?=Ves a un monstruo sin cabeza, ¿Cómo ha podido oír que nos acercábamos a él? + +rotten zombie=zombi podrido +You see a rotten zombie. You are disgusted as you see its rotten skin that hangs down in pieces from his half rotten bones.=Ves a un zombi podrido. Estás asqueado al ver su piel podrida que cuelga hecha jirones de sus huesos medio podridos. + + +# strings not found in template + +You see a pauldroned leather cuirass. It was crafted to withstand minor attacks.=Ves una coraza de cuero con hombreras. Fue diseñada para soportar ataques menores. +You see a strange strange suit of mainio armor. What it lacks in subtlety it makes up for with strength.=Ves un extraño traje de armadura de mainio. Lo que le falta en sutileza lo suple con fortaleza. +You see a golden arrow. With a fist full of these and a good bow, you will surely take down your enemies quicker.=Ves una flecha de oro. Con un puñado de éstas y un buen arco, derribarás a tus enemigos más rápido. +You see a power arrow. The sting of this arrow will surely defeat your enemies, when equipped with a bow.=Ves una flecha de potencia. La punzada de esta flecha seguramente derrotará a tus enemigos, cuando vaya equipada con un arco. +You see an old scythe, it used to be weapon of death. But now it is only a useful tool for farming.=Ves una vieja guadaña, solía ser el arma de la muerte. Pero ahora sólo es una útil herramienta de labranza. +You see a golden twoside axe. This axe is a rare find.=Ves un hacha de doble hoja de oro. Este hacha es un raro hallazgo. +You see a pair of stone boots. They may be heavy, but they protect your feet well.=Ves un par de botas de piedra. Puede que sean pesadas, pero te protegen bien los pies. +You see a golden cloak. See how the light glistens off the gold, it is a prized possession.=Ves una capa de oro. Ves cómo la luz brilla saliendo del oro, es una preciada posesión. +You see a mainio cloak. It's flashing colors are absurd! But you wear it because it's very well made.=Ves una capa de mainio ¡Sus colores parpadeantes son absurdos! Pero la llevas puesta porque está muy bien elaborada. +You see a xeno cloak. It's heavy and thick, giving you a good protection.=Ves una capa de xeno. Es pesada y gruesa, proporcionandote una buena protección. +rift cloak=capa de rift +You see a rift cloak. Almost useless in the battle, but saves your life when you enter a magical rift.=Ves una capa de rift. Casi inútil en la batalla, pero te salva la vida cuando entras en un rift mágico. +You see a military flail. Swinging it in circles will tire you but it will be an effective weapon.=Ves un mangual militar. Moverlo en círculos te cansará pero será un arma efectiva. +You see a morning star. This is a very rare item indeed.=Ves un lucero del alba. Éste es realmente un artículo raro. +You see a huge war hammer. It seems strong but is so heavy that you can only lift it to attack every so often..=Ves un enorme martillo de guerra. Parece potente pero es tan pesado que sólo lo puedes levantar de vez en cuando para atacar.. +You see a ice war hammer. The last owner must have been huge, to wield it.=Ves un martillo de guerra de hielo. Su último dueño debe de haber sido enorme, para manejarlo. +necromancers staff=baston de nigromante +You see a cunningly beautiful staff. If you listen carefully you can hear its previous owners' souls screaming from within it.=Ves un bastón engañosamente hermoso. Si escuchas atentamente puedes oir las almas de sus anteriores dueños gritar desde dentro. +You see a rod of the GM. This rod is reserved for those with special powers, be careful not to let it fall into the wrong hands.=Ves una vara del DJ. Esta vara se reserva a aquellos con poderes especiales, ten cuidado de no dejar que caiga en las manos equivocadas. You see a flask. This flask is good for storing medicine.=Ves un frasco. Este frasco es bueno para almacenar medicina. bottle=botella You see a bottle. It is empty, someone drank the contents.=Ves una botella. Está vacía, alguien se bebió su contenido. big bottle=botella grande You see a big bottle.=Ves una botella grande. -eared bottle=botella con asas -You see an eared bottle. It is empty, someone drank the contents.=Ves una botella con asas. Está vacía, alguien se bebió su contenido. -fat bottle=botella gruesa -You see a fat bottle. It is empty, someone drank the contents.=Ves una botella gruesa. Está vacía, alguien se bebió su contenido. short rounded bottle=botella redondeada baja You see a short rounded bottle. It is empty, someone drank the contents.=Ves una botella redondeada baja. Está vacía, alguien se bebió su contenido. short triangular bottle=botella triangular baja You see a short triangular bottle. It is empty, someone drank the contents.=Ves una botella triangular baja. Está vacía, alguien se bebió su contenido. -slim bottle=botella estrecha -You see a slim bottle. It is empty, someone drank the contents.=Ves una botella estrecha. Está vacía, alguien se bebió su contenido. squared bottle=botella cuadrada You see a squared bottle. It is empty, someone drank the contents.=Ves una botella cuadrada. Está vacía, alguien se bebió su contenido. tall bottle=botella alta. You see a tall bottle. It is empty, someone drank the contents.=Ves una botella alta. Está vacía, alguien se bebió su contenido. triangular bottle=botella triangular You see a triangular bottle. It is empty, someone drank the contents.=Ves una botella triangular. Está vacía, alguien se bebió su contenido. - -empty goblet=copa vacía You see an empty goblet. You wonder what could it hold.=Ves una copa vacía. Te preguntas que podría contener. -goblet=copa You see a goblet. You look at its contents, and shiver at the blood inside.=Ves una copa. Miras su contenido, y sientes escalofríos al ver sangre dentro. -keyring=llavero -You see a keyring.=Ves un llavero. -note=nota -You see a note.=Ves una nota. -coupon=cupón -You see a coupon.=Ves un cupón. -closed envelope=sobre cerrado -opened envelope=sobre abierto -sealed envelope=sobre sellado -unsealed envelope=sobre sellado abierto -assassins id=identificación de asesino -You see an assassin's ID. Perhaps this can be put to good use.=Ves una identificación de asesino. Quizá puedas hacer un buen uso de ella. -map=mapa blank scroll=pergamino en blanco You see a rolled up blank scroll.=Ves un pergamino enrollado y en blanco ice scroll=pergamino de hielo You see a scroll, circled by ice crystals. You can feel its cold aura.=Ves un pergamino, rodeado por cristales de hielo. Puedes sentir su fría aura. -fierywater=aguardiente -You see a bottle of fierywater. Do not drink it pure, you would evaporate!=Ves una botella de aguardiente. No te la bebas pura, ¡Te evaporarías! -mild koboldish torcibud=suave torcibud koboldiano -You see a bottle of mild koboldish torcibud. It will help you recover when you're all bruised and battered.=Ves una botella de suave torcibud koboldiano. Te ayudará a recuperarte cuando estés todo magullado. -strong koboldish torcibud=fuerte torcibud koboldiano -You see a bottle of strong koboldish torcibud. It will help you recover when you're all bruised and battered.=Ves una botella de fuerte torcibud koboldiano. Te ayudará a recuperarte cuando estés todo magullado. -vsop koboldish torcibud=torcibud koboldiano de estaca vieja muy especial -You see a bottle of VSOP koboldish torcibud, specially aged in oak casks wrapped by the darkness of a dungeon cellar. It will help you recover when you're all bruised and battered.=Ves un torcibud koboldiano de estaca vieja muy especial, especialmente envejecida en barricas de roble envueltas por la oscuridad de la bodega de una mazmorra. Te ayudará a recuperarte cuando estés todo magullado. -apple juice=zumo de manzana -You see apple juice. On a hot summer day, it would taste great.=Ves zumo de manzana. En un día de verano caluroso, sabría estupendo. -beer=cerveza -You see a beer. On a hot summer day, it would taste great.=Ves una cerveza. En un día de verano caluroso, sabría estupendo. -wine=vino -You see a glass of red wine. It will quench your thirst.=Ves un vaso de vino tinto. Saciará tu sed. -water=agua -You see a bottle of fresh spring water. It's really tasty and fresh.=Ves una botella de agua fresca de manantial. Es realmente sabrosa y fresca. -pina colada=piña colada You see a pina colada. It looks delicious but tastes dangerously strong!.=Ves una piña colada ¡Parece deliciosa pero sabe peligrosamente fuerte! -tea=té -You see a lovely cup of tea.=Ves una encantadora taza de té. -milk=leche -You see a small bottle of fresh milk.=Ves una pequeña botella de leche fresca. -antidote=antídoto -You see an antidote, to cure you of poison and protect you for a while.=Ves un antídoto, para curarte de venenos y protegerte durante un rato. -greater antidote=antidoto mayor -You see a greater antidote, to cure you of poison and protect you for a long while.=Ves un antidoto mayor, para curarte de venenos y protegerte durante un largo rato. -poison=veneno -You see a bottle of poison. Don't drink it!=Ves una botella de veneno ¡No te la tomes! -greater poison=veneno mayor -You see a greater poison. Don't drink it!=Ves un veneno mayor ¡No te lo tomes! -deadly poison=veneno mortal -You see a deadly poison. Don't drink it!=Ves un veneno mortal ¡No te lo tomes! -disease poison=veneno de enfermar You see a disease poison. Be careful, it's wicked.=Ves un veneno de enfermar. Ten cuidado, es malvado. -mega poison=mega veneno -You see a mega poison. This is some wicked poison.=Ves un mega veneno. Éste es un veneno malvado. -twilight elixir=elixir del crepúsculo -You see a bottle of medicinal elixir.=Ves una botella de elixir medicinal. -minor potion=poción menor -You see a minor potion. It's not much but may save you in a tight spot.=Ves una poción menor. No es mucho pero puede salvarte en una situación difícil. -soup=sopa -You see a bowl of soup. Its contents fill you up.=Ves un plato de sopa. Su contenido te llena. -fish soup=sopa de pescado -You see a bowl of fish soup. Its contents fill you up.=Ves un plato de sopa de pescado. Su contenido te llena. -potion=poción -You see a potion. Take it to battle and you may survive longer.=Ves una poción. Llevatela a la batalla y puedes sobrevivir por más tiempo. -greater potion=poción mayor -You see a greater potion, invaluable in battle.=Ves una poción mayor, inestimable en la batalla. -mega potion=mega poción -You see a mega potion. It strengthens greatly.=Ves una mega poción. Te fortalece en gran medida. -love potion=poción de amor -You see a love potion. It looks powerful so take care to use it carefully!=Ves una poción de amor ¡Parece potente así que ten cuidado de usarla con precaución! -rhosyd=rhosyd -You see a beautiful and rare rhosyd flower.=Ves una bella y rara flor de rhosyd. -rose=rosa -You see a single red rose. It smells heavenly.=Ves una sola rosa roja. -lilia=lilia -You see a lilia, a single precious bloom.=Ves una lilia, una sola flor preciosa. -daisies=margaritas -You see a bunch of daisies. They are cheap and cheerful!=Ves un ramo de margaritas ¡Son baratas y alegran! -pansy=pensamiento -You see a pansy, so colorful and beautiful.=Ves un pensamiento, tan colorido y hermoso. -zantedeschia=zantedeschia -You see a zantedeschia, a delicate bloom with the sweetest fragrance.=Ves una zantedeschia, una flor delicada con la más dulce de las fragancias. -cherry=cereza -You see a cherry. Its tangy taste revives you a little.=Ves una cereza. Su sabor amargo te revive un poco. -butter=mantequilla -You see some butter. It is an ingredient or can be eaten if you like.=Ves un poco de mantequilla. Es un ingrediente o se puede comer si quieres. -cheese=queso You see some cheese. Eat it and see what happens.=Ves un poco de queso. Cometelo y verás lo que pasa. -coconut=coco -You see a coconut. Luckily it's already cracked and you can drink from it.=Ves un coco. Afortunadamente ya está abierto y puedes beber de él. -icecream=helado You see a wafer cone with vanilla ice cream and a chocolate flake.=Ves un cucurucho de helado de vainilla y virutas de chocolate. -pineapple=piña -You see a tropical pineapple.=Ves una piña tropical. -artichoke=alcachofa You see an artichoke. It can be an ingredient, or you can eat it.=Ves una alcachofa. Puede ser un ingrediente, o te la puedes comer. -carrot=zanahoria You see a carrot. It can be an ingredient, or you can eat it.=Ves una zanahoria. Puede ser un ingrediente, o te la puedes comer. salad=ensalada You see a salad.=Ves una ensalada. -tomato=tomate -You see a tomato, put it in a salad or eat it.=Ves un tomate, ponlo en la ensalada o cometelo. -apple=manzana -You see a nice shiny apple.=Ves una bonita y brillante manzana. -black apple=manzana negra -You see a black apple. It must be a gift from lil Johnnnny. He's the guy with black items.=Ves una manzana negra. Debe de ser un regalo del pequeño Johnnny -bread=pan You see a loaf of bread. It is freshly baked and ready to eat.=Ves una barra de pan. Está recién horneada y lista para comer. -button mushroom=champiñón común You see a button mushroom. It can be an ingredient, or you can eat it.=Ves un champiñón común. Puede ser un ingrediente, o te lo puedes comer. -porcini=seta calabaza You see a porcini. It can be an ingredient, or you can eat it.=Ves una seta calabaza. Puede ser un ingrediente, o te la puedes comer. -spinach=espinacas -You see spinach. It is enriched with vitamins.=Ves espinacas. Está enriquecida con vitaminas. courgette=calabacín You see a courgette. It can be an ingredient, or you can eat it.=Ves un calabacín. Puede ser un ingrediente, o te lo puedes comer. -collard=col -You see a collard. It's rare and strangely magical.=Ves una col. Es rara y extrañamente mágica. -onion=cebolla -You see an onion.=Ves una cebolla. -garlic=ajo -You see some fresh garlic.=Ves un poco de ajo fresco. -cauliflower=coliflor -You see a fresh head of cauliflower.=Ves la cabeza de una fresca coliflor. -broccoli=brocoli -You see a bunch of broccoli.=Ves un manojo de brocoli. -leek=puerro -You see a fresh leek.=Ves un puerro fresco. -perch=perca -You see a perch.=Ves una perca. -mackerel=caballa -You see a mackerel.=Ves una caballa. -roach=rutilo -You see a roach.=Ves un rutilo -char=salvelinus -You see a char, with a fleshy pink belly.=Ves un salvelinus, con un vientre carnoso de color rosa. -clownfish=pez payaso -You see a striped clownfish.=Ves un pez payaso a rayas. -surgeonfish=pez cirujano -You see a bright blue surgeonfish.=Ves un pez cirujano de color azul brillante. -red lionfish=pterois rojo -You see a venomous coral reef red lionfish.=Ves un pterois rojo venenoso de los arrecifes de coral -egg=huevo -You see an egg.=Ves un huevo. -chicken=pollo -You see a tasty leg of chicken.=Ves un sabroso muslo de pollo. -meat=carne -You see a piece of meat.=Ves un pedazo de carne. -trout=trucha -You see a trout.=Ves una trucha. -cod=bacalao -You see a cod.=Ves un bacalao. -ham=jamón -You see a juicy ham.=Ves un jugoso jamón. -toadstool=seta venenosa -You see a toadstool. Beware!=Ves una seta venenosa ¡Ten cuidado! -fairy cake=fairy cake -You see a luscious fairy cake with icing and sprinkles on top.=Ves un delicioso fairy cake con cobertura y fideos de chocolate por encima. -crepes suzette=crepe suzette -You see a crepes suzette topped with hot chocolate sauce.=Ves una crepe suzette cubierta con salsa de chocolate caliente. -sandwich=sandwich -You see a ham and cheese sandwich.=Ves un sandwich de jamón y queso. -pie=pastel -You see a meat and vegetable pie.=Ves un pastel de carne y verduras. -fish pie=empanada de pescado -You see a fish and leek pie. It's not too stodgy so you can eat it faster than a meat pie.=Ves una empanada de pescado y puerros. No es demasiado pesada así que te la puedes comer más rápido que un pastel de carne. -apple pie=tarta de manzana -You see a delicious apple pie, made with only genuine ingredients.=Ves una deliciosa tarta de manzana, elaborada sólo con los ingredientes genuinos. -cherry pie=tarta de cereza -You see a delicious cherry pie, made with only genuine ingredients.=Ves una tarta de cereza deliciosa, elaborada sólo con los ingredientes genuinos. -pizza=pizza -You see a tasty pizza, and hope they put extra cheese on it.=Ves una sabrosa pizza, y esperas que le hayan puesto extra de queso por encima. -easter egg=huevo de pascua -You see a lovely chocolate easter egg. It's huge!=Ves un encantador huevo de pascua ¡Es enorme! -small easter egg=huevo de pascua pequeño -You see a small chocolate easter egg. Yummy!=Ves un pequeño huevo de pascua de chocolate ¡Delicioso! -chocolate bar=barrita de chocolate -You see an absolutely yummy chocolate bar.=Ves una barrita de chocolate absolutamente deliciosa. -tuna sandwich=sandwich de atún You see what looks like tuna sandwich.=Ves lo que parece ser un sandwich de atún. -sausage=salchicha -You see what looks like a tasty sausage.=Ves lo que parece ser una sabrosa salchicha. -cheese sausage=salchicha de queso -You see what looks like a tasty cheese sausage.=Ves lo que parece ser una sabrosa salchicha de queso. -hotdog=perrito caliente -You see what looks like a tasty hotdog on a bun.=Ves lo que parece ser un sabroso perrito caliente en un bollo. -cheeseydog=perrito caliente con queso -You see what looks like a tasty cheeseydog on a bun.=Ves lo que parece ser un sabroso perrito caliente con queso en un bollo. -vanilla shake=batido de vainilla -You see a yummy vanilla shake. Absolutely NO calories.=Ves un sabroso batido de vainilla. Absolutamente SIN calorías. -chocolate shake=batido de chocolate -You see a scrumptious chocolate shake. Absolutely NO calories.=Ves un batido de chocolate para chuparse los dedos. Absolutamente SIN calorías. -honey=miel -You see a jar of sticky sweet honey. It's the clear runny kind.=Ves una jarra de miel dulce y pegajosa. Es de tipo fluído y claro. -sugar=azúcar -You see a sack of raw sugar.=Ves un saco de azúcar no refinado. -licorice=regaliz -You see some delicious licorice. Your mouth waters.=Ves un poco de delicioso regaliz. Se te hace la boca agua. -grilled steak=filete a la parrilla -You see a fresh grilled steak. It smells awesome and is really juicy.=Ves un filete a la parrilla recién hecho. Huele fenomenal y está realmente jugoso. -leather helmet=casco de cuero -You see a leather helmet, it seems more like a hat than a defensive item.=Ves un casco de cuero, parece más un sombrero que un elemento defensivo. -trophy helmet=casco trofeo -robins hat=sombrero de robin -You see a robins hat. It's cute but that's about it.=Ves un sombrero de robin. Es gracioso pero eso es todo. -studded helmet=casco tachonado -You see a studded helmet, it should protect your head against cuts but perhaps not hard blows.=Ves un casco tachonado, debería de protegerte la cabeza de cortes pero quizá no de golpes fuertes. -chain helmet=casco de cota de malla -You see a solid chain helmet, it will be excellent protection for your head.=Ves un sólido casco de cota de malla, será una excelente protección para la cabeza. -viking helmet=casco de vikingo -You see a viking helmet. The previous owner wore it to many battles.=Ves un casco de vikingo. Su anterior dueño lo llevó consigo a muchas batallas. -aventail=almófar You see a aventail. It's a clever design.=Ves un almófar. Es un diseño ingenioso. -red helmet=casco rojo -You see a red helmet, it reminds you of a jester's hat but you can be sure it has better protection than that.=Ves un casco rojo, te recuerda al sombrero de un bufón pero puedes estar seguro de que te proporcionará una protección mejor que esa. -blue helmet=casco azul -You see a brand new blue helmet.=Ves un casco azul nuevecito. -golden helmet=casco de oro -You see a heavy golden helmet. The thick metal should protect you against almost anything.=Ves un pesado casco de oro. El grueso metal debería de protegerte contra casi todo. -shadow helmet=casco de sombra -You see a heavy shadow helmet. Instead of shining, it darkly gleams.=Ves un pesado casco de sombra. En lugar de brillar, emite destellos oscuros. -horned golden helmet=casco de oro con cuernos -You see a horned golden helmet.=Ves un casco de oro con cuernos. -chaos helmet=casco del caos -You see a chaos helmet.=Ves un casco del caos. -mainio helmet=casco de mainio -You see a strange mainio helmet. You can barely see when wearing it, but it protects your head very well.=Ves un extraño casco de mainio. Apenas puedes ver cuando lo llevas puesto, pero te protege muy bien la cabeza. -magic chain helmet=casco de cota de malla mágico -You see a magic chain helmet.=Ves un casco de cota de malla mágico. -liberty helmet=casco de la libertad -You see the liberty helmet. It's light and strong, you feel free wearing it.=Ves el casco de la libertad. Es ligero y resistente, te sientes libre al llevarlo puesto. -black helmet=casco negro -You see a black helmet.=Ves un casco negro -mithril helmet=casco de mithril -You see a mithril helmet.=Ves un casco de mithril. -arandula=arandula You see a arandula. It has medicinal properties, if the right person uses it.=Ves una arandula. Tiene propiedades medicinales, si es usada por la persona adecuada. -kokuda=kokuda -You see a kokuda. It has medicinal properties, if the right person uses it.=Ves una kokuda. Tiene propiedades medicinales, si es usada por la persona adecuada. -kekik=kekik -You see a kekik. It is a herb which can have healing properties.=Ves una kekik. Es una hierba que puede tener propiedades curativas. -mandragora=mandrágora -You see a root of mandragora. It has medicinal properties, if the right person uses it.=Ves una raíz de mandrágora. Tiene propiedades medicinales, si es usada por la persona adecuada. -sclaria=sclaria -You see the herb sclaria. The smell is calming.=Ves la hierba sclaria. Su olor es calmante. -emerald=esmeralda -You see an emerald, a precious gemstone.=Ves una esmeralda, una gema preciosa. -sapphire=zafiro -You see a sapphire, a precious gemstone.=Ves un zafiro, una gema preciosa. -carbuncle=carbúnculo -You see a carbuncle, a precious gemstone related to the garnet.=Ves un carbúnculo, una gema preciosa relacionada con el granate. -obsidian=obsidiana -You see a piece of obsidian, it's known as volcanic glass because it forms when lava cools rapidly. When used as a gemstone it may look jet black or silvery grey, depending on how it is cut.=Ves una pieza de obsidiana, es conocida como vidrio volcánico porque se forma cuando la lava se enfría rápidamente. Cuando se usa como gema puede parecer negro azabache o gris plateado, dependiendo de cómo se corte. -diamond=diamante You see a diamond, not just a beautiful gem but also the hardest naturally occurring material .=Ves un diamante, no es sólo una hermosa gema sino también el material más duro de origen natural. -black pearl=perla negra -You see a black pearl, so dark and shiny.=Ves una perla negra, tan oscura y brillante. -dungeon silver key=llave de plata de la mazmorra -You see a silver dungeon key. Use it only if you are brave.=Ves una llave de plata de la mazmorra. Usala sólo si eres valiente. -lich gold key=llave de oro del lich -You see a golden lich key. It will open the door to terrible things.=Ves una llave de oro del lick. Abrirá la puerta a cosas terribles. -minotaur key=llave del minotauro You see a fancy bronze key. It smells faintly of minotaur, perhaps one dropped it?=Ves una lujosa llave de bronce. Huele ligeramente a minotauro, ¿quizá se le cayó a uno? -nalwor bank key=llave del banco de nalwor -You see a key to the customer room of Nalwor Bank.=Ves una llave de la sala de clientes del Banco de Nalwork. -kotoch prison key=llave de la prisión de kotoch -You see an ancient copper key, enscribed with something in Orcish.=Ves una antigua llave de cobre, grabada con algo en Orco. -kanmararn prison key=llave de la prisión de kanmararn. -You see a key which matches the locks in the Kanmararn prison.=Ves una llave que coincide con las cerraduras de la prisión de Kanmararn. -sedah gate key=llave de la puerta de sedah -You see a key for the gate to the imperial city of Sedah.=Ves una llave que abre la puerta que lleva a la ciudad imperial de Sedah. -pet sanctuary key=llave del santuario de mascotas -You see a key for the pet sanctuary in Ados.=Ves una llave que abre el santuario de mascotas en Ados. -house key=llave de la casa -You should not see this description=No deberías de poder ver esta descripción -master key=llave maestra fado hotel key 001=llave 001 del hotel de fado You see a key to room #001 in the Fado Hotel.=Ves una llave de la habitación #001 del hotel de Fado. fado hotel key 002=llave 002 del hotel de fado @@ -540,444 +2933,66 @@ fado hotel key 007=llave 007 del hotel de fado You see a key to room #007 in the Fado Hotel.=Ves una llave de la habitación #007 del hotel de Fado. fado hotel key 008=llave 008 del hotel de fado You see a key to room #008 in the Fado Hotel.=Ves una llave de la habitación #008 del hotel de Fado. -small key=llave pequeña -You see the key for Zara's row house in Ados.=Ves la llave de la row house de Zara en Ados. -leather legs=quijotes de cuero -You see a pair of leather legs. They look new but they're poor quality.=Ves un par de quijotes de cuero. Parecen nuevos pero son de mala calidad. -studded legs=quijotes tachonados You see a pair of blood stained studded legs. You're not sure if the blood came from their last owner ... or his enemies.=Ves un par de quijotes tachonados manchados de sangre. No estás seguro de si la sangre es de su último dueño ... o de sus enemigos. -chain legs=quijotes de cota de malla -You see a pair of well made chain legs. They should protect you against any attacks aimed low.=Ves un par de quijotes de cota de malla bien elaborados. Deberían de protegerte frente a cualquier ataque bajo. -red legs=quijotes rojos -A pair of red legs are in your grasp.=Un par de quijotes rojos están a tu alcance. -elvish legs=quijotes élficos -You see a pair of elvish legs.=Ves un par de quijotes élficos. -blue legs=quijotes azules -You see a pair of shiny new blue legs.=Ves un par de quijotes azules nuevos y brillantes. -golden legs=quijotes de oro -You see a pair of shining, strong golden legs.=Ves un par de quijotes de oro, resistentes y relucientes. -shadow legs=quijotes de sombra -You see a pair of shadow legs. The weight of them is incredible.=Ves un par de quijotes de sombra. Su peso es increíble. -mainio legs=quijotes de mainio You see a pair of odd looking mainio legs. They are somewhat startling but they give you a good protection.=Ves un par de quijotes de mainio de extraño aspecto. Son de algún modo sorprendentes pero te proporcionan una buena proteccion. -chaos legs=quijotes del caos -You see a pair of chaos legs. The strange colors confuse you.=Ves un par de quijotes del caos. Sus extraños colores te confunden. -xeno legs=quijotes de xeno -You see a pair of xeno legs. They're very strong and look brand new.=Ves un par de quijotes de xeno. Son muy resistentes y parecen nuevecitos. -jewelled legs=quijotes enjoyados -You see a beautiful pair of jewelled legs. A large red gem glints at you and they're encrusted all over with sapphires.=Ves un hermoso par de quijotes enjoyados. Una gema roja grande emite reflejos hacia ti y tienen incrustaciones de zafiro por todas partes. -black legs=quijotes negros -You see a pair of black legs.=Ves un par de quijotes negros. -mithril legs=quijotes de mithril -You see a pair of mithril legs. They will serve you well.=Ves un par de quijotes de mithril. Te servirán de mucho. -bulb=bulbo You see a bulb. It can be planted anywhere, but it will only thrive on fertile ground.=Ves un bulbo. Puede ser plantado en cualquier sitio, pero sólo prosperará en un terreno fértil. -seed=semilla You see a seed. It can be planted anywhere, but it will only thrive on fertile ground.=Ves una semilla. Puede ser plantada en cualquier sitio, pero sólo prosperará en un terreno fértil. -giant heart=corazón gigante -You see a giant heart. This proves that a giant was defeated, and has magical properties that you are not sure of.=Ves un corazón gigante. Ésto demuestra que un gigante fue derrotado, y tiene propiedades mágicas de las que no estás seguro. -dice=dados -You see a set of dice. May lady luck be with you.=Ves un grupo de dados. Que la suerte te acompañe. -cards=cartas You see a deck of cards. Shuffle them well, to get a winning hand.=Ves una baraja de cartas. Barajealas bien, para ganar la mano. -teddy=peluche You see a teddy bear. Its soft and cuddly, and children love them.=Ves un oso de peluche. Es suave y tierno, y a los niños les encanta. -vampirette entrails=entrañas de vampiresa You see some vampirette entrails. These guts proves that a vampirette was slain.=Ves unas entrañas de vampiresa. Estas vísceras demuestran que una vampiresa fue asesinada. -bat entrails=entrañas de murciégalo -You see some bat entrails, full of the blood of a living creature.=Ves unas entrañas de murciégalo, llenas de sangre de algún ser vivo. -suntan cream=crema bronceadora -marbles=canicas -You see some marbles. Boys will be boys.=Ves unas canicas. Son cosas de niños. -canned tuna=atún en lata You see tuna in a can. Too bad you don't have a can opener.=Ves atún en una lata. Lástima que no tengas un abrelatas. -snowglobe=esfera de nieve You see a snowglobe. You are SUCH a tourist!=Ves una esfera de nieve ¡Estás hecho un turista! -bobbin=canilla -You see a bobbin for a sewing machine.=Ves una canilla para una máquina de coser. -snowball=bola de nieve You see snowballs. You can throw them at your friends or put it in your bag to keep your fish fresh. But be careful, there could be little stones in it.=Ves bolas de nieve. Puedes tirarselas a tus amigos o ponerlas en tu bolsa para conservar el pescado fresco. Pero ten cuidado, podría haber piedrecitas dentro de ella. -vomit=vómito -You see a pile of vomit. Gross!=Ves un montón de vómito ¡Qué desagradable! dart=dardo You see a dart. You'll need to be close before you can use it as a missile. Stand square on, not diagonally, for the best results.=Ves un dardo. Necesitarás estar cerca antes de que lo puedas usar como proyectil. Permanece recto, no inclinado, para obtener los mejores resultados. power dart=dardo de potencia You see a power dart. You'll need to be close before you can use it as a missile. Stand square on, not diagonally, for the best results.=Ves un dardo de potencia. Necesitarás estar cerca antes de que lo puedas usar como proyectil. Permanece recto, no inclinado, para obtener los mejores resultados. -shuriken=shuriken -You see a shuriken. You'll need to be close before you can use it as a missile. Stand square on, not diagonally, for the best results.=Ves un shuriken. Necesitarás estar cerca antes de que lo puedas usar como proyectil. Permanece recto, no inclinado, para obtener los mejores resultados. -fire shuriken=shuriken de fuego -You see a fire shuriken. Throwing this flaming missile unleashes fiendish power.=Ves un shuriken de fuego. El lanzamiento de este proyectil en llamas desata un poder diabólico. -wooden spear=lanza de madera -You see a wooden spear. You can attack at a distance with this primitive weapon. Stand square on, not diagonally, for the best results.=Ves una lanza de madera. Puedes atacar a distancia con este arma primitiva. Permanece recto, no inclinado, para obtener los mejores resultados. -money=dinero -wooden bow=arco de madera -You see a wooden bow. With this in one hand, and wooden arrows in the other, you may be able to attack from a distance.=Ves un arco de madera. Con esto en una mano, y flechas de madera en la otra, puedes ser capaz de atacar a distancia. -longbow=arco largo -You see a longbow. Equipped with this, and a supply of arrows, you will have an effective ranged attack.=Ves un arco largo. Equipado con ésto, y con un surtido de flechas, conseguirás un efectivo ataque a distancia. -composite bow=arco compuesto -You see a composite bow. It's better strung than most bows, for excellent ranged attack.=Ves un arco compuesto. Está mejor tensado que la mayoría de arcos, para proporcionar un excelente ataque a distancia. -crossbow=ballesta You see a crossbow. The attack is high but it has a very short range, what do you prefer?=Ves una ballesta. Su ataque es elevado pero cubre una distancia muy corta, ¿qué prefieres? -hunter crossbow=ballesta de cazador -You see a hunter crossbow. You must decide if the high attack is worth the short range it has.=Ves una ballesta de cazador. Debes decidir si su elevado ataque compensa la corta distancia que cubre. -mithril bow=arco de mithril -You see a light and strong mithril bow. Its impeccable workmanship affords incredible accuracy.=Ves un arco de mithril ligero y resistente. Su impecable elaboración permite una precisión increíble. angel figurine=figurilla de ángel You see a sparkling angel figurine.=Ves una figurilla de ángel resplandeciente. -skull ring=anillo de calavera -You see a skull ring.=Ves un anillo de calavera. -amulet=amuleto ankh=anj You see a mysterious ankh. You don't know what it is for.=Ves un misterioso anj. No sabes para qué sirve. -wood=madera -You see some wood, fallen from a nearby tree.=Ves un poco de madera, caída de algún árbol cercano. -sugar cane=caña de azúcar -You see a sugar cane. You can grind it for raw sugar.=Ves una caña de azúcar. Puedes molerla para obtener azúcar no refinado. -grain=trigo -You see a sheaf of grain.=Ves una gavilla de trigo. -flour=harina -iron ore=mineral de hierro -coal=carbón -You see a black and shiny piece of stone coal. It stayed in the ground for million of years.=Ves un pedazo de piedra de carbón negro y brillante. Permaneció enterrado durante millones de años. -wool=lana -You see wool. It was recently shorn.=Ves lana. Fue esquilada recientemente. -yarn=hilo de lana -You see a ball of yarn. It was spun with care.=Ves un ovillo de lana. Fue hilado con sumo cuidado. -cloth=tela -You see a roll of cloth. It is of first-class quality.=Ves un rollo de tela. Es de primera calidad. -gold nugget=pepita de oro -You see a gold nugget. Its rich golden color shines, and it may be useful.=Ves una pepita de oro. Su vivo color dorado brilla,y puede resultar útil. -mithril nugget=pepita de mithril -You see a mithril nugget. Its pale silvery color shines, and it may be useful.=Ves una pepita de mithril. Su pálido color plateado brilla, y puede resultar útil. iron=hierro -gold bar=barra de oro -You see a gold bar. It will make beautiful jewelry, or fetch a fine price.=Ves una barra de oro. Servirá para hacer hermosas joyas, o se pagará un buen precio por ella. -mithril bar=barra de mithril -You see a mithril bar. It can be made into excellent armor, or fetch a fine price.=Ves una barra de mithril. Se puede elaborar una armadura excelente con ella, o se puede pagar un buen precio por ella. -golden egg=huevo de oro -You see a valuable golden egg.=Ves un valioso huevo de oro. -spotted egg=huevo con manchas -You see a spotted egg. They are said to be delicious.=Ves un huevo con manchas. Se dice que son deliciosos. reptile egg=huevo de reptil You see a valuable reptile egg.=Ves un valioso huevo de reptil. -silk gland=glándula de seda -You see a silk gland from a giant spider. Its contents are extremely valuable.=Ves una glándula de seda de una araña gigante. Su contenido es extremadamente valioso. -silk thread=hilo de seda You see a spool of silk thread, spun from the glands of a giant spider..=Ves un carrete de hilo de seda, hilado de las glándulas de una araña gigante.. -oil=aceite -You see a small can of oil.=Ves una pequeña lata de aceite. -mithril thread=hilo de mithril -You see a spool of mithril thread, made from silk fused with mithril.=Ves un carrete de hilo de mithril, elaborado a partir de seda fundida con mithril. -mithril fabric=tela de mithril -You see a couple yards of mithril fabric. It's very sparkly!=Ves un par de metros de tela de mithril ¡Emite muchos destellos! -horse hair=pelo de caballo -You see some horse hairs.=Ves un poco de pelos de caballo. -beeswax=cera de abeja -You see a piece of beeswax.=Ves un pedazo de cera de abeja. -candle=vela -You see a candle in a candle stick.=Ves una vela en un candelero. -wedding ring=anillo de boda -engagement ring=anillo de compromiso -You see a diamond engagement ring, a symbol of love (or a symbol of wealth?)=Ves un anillo de compromiso de diamante, un símbolo de amor (¿o un símbolo de riqueza?) -emerald ring=anillo de esmeralda -You see an emerald ring, known as ring of life. Wear it, and you risk less from death.=Ves un anillo de esmeralda, conocido como el anillo de la vida. Llevalo, y arriesgarás menos al morir. -summon scroll=pergamino de invocación -nalwor city scroll=pergamino de la ciudad de nalwor -You see a nalwor city scroll, it will take you back to nalwor city.=Ves un pergamino de la ciudad de nalwor, te llevará de regreso a la ciudad de nalwor. -ados city scroll=pergamino de la ciudad de ados You see a ados city scroll, it will take you back to ados city.=Ves un pergamino de la ciudad de ados, te llevará de regreso a la ciudad de ados. -fado city scroll=pergamino de la ciudad de fado -You see a fado city scroll, it will take you back to fado city.=Ves un pergamino de la ciudad de fado, te llevará de regreso a la ciudad de fado. -kirdneh city scroll=pergamino de la ciudad de kirdneh -You see a kirdneh city scroll, it will take you back to kirdneh city.=Ves un pergamino de la ciudad de kirdneh, te llevará de regreso a la ciudad de kirdneh. -kalavan city scroll=pergamino de la ciudad de kalavan -You see a kalavan city scroll, it will take you back to kalavan city.=Ves un pergamino de la ciudad de kalavan, te llevará de regreso a la ciudad de kalavan. -marked scroll=pergamino marcado -invitation scroll=pergamino de invitación -home scroll=pergamino del hogar -You see a home scroll, it will take you back to semos city.=Ves un pergamino del hogar, te llevará de regreso a la ciudad de semos. -empty scroll=pergamino en blanco -You see an empty scroll. If used correctly it will return you to where you marked it at.=Ves un pergamino en blanco. Usado correctamente te llevará de regreso a donde lo marcaste. -rainbow beans=haba del arco iris -You see a small pile of rainbow beans. One says something odd.=Ves un pequeño montón de habas del arco iris. Una dice algo raro. -balloon=globo -You see a bright red balloon. You can use it to float high up into the clouds.=Ves un globo de color rojo brillante. Puedes usarlo para flotar en lo alto de las nubes. -twilight moss=musgo del crepúsculo -You see a strange looking piece of moss. It looks like it could have hallucinogenic properties.=Ves un pedazo de musgo de aspecto extraño. Parece que podría tener propiedades alucinógenas. -buckler=broquel -You see a small buckler. It may protect you against swords and maces but against stronger weapons you do not trust it.=Ves un pequeño broquel. Puede protegerte frente a espadas y mazas pero frente a armas más potentes no te confíes. -wooden shield=escudo de madera -You see a wooden shield. It is made of cheap wood and heavily used. However, it still seems to offer you some kind of basic protection.=Ves un escudo de madera. Está elaborado a partir de madera barata y ha sido muy utilizado. Sin embargo, todavía parece proporcionar algún tipo de protección básica. -studded shield=escudo tachonado. -You see a studded shield. It's a little dented but seems robust enough.=Ves un escudo tachonado. Está un poco abollado peroparece bastante robusto. -plate shield=escudo de placas de acero -You see a solid plate shield. It is in good condition, and might be worth a little.=Ves un sólido escudo de placas de acero. Está en buenas condiciones, y podría valer bastante. -lion shield=escudo de león -You see a valuable lion shield. It is heavy enough to defend you against strong attacks.=Ves un valioso escudo de león. Es lo bastante pesado como para defenderte frente a ataques potentes. -unicorn shield=escudo del unicornio -You see a unicorn shield. It's beautifully crafted and will give you excellent protection.=Ves un escudo del unicornio. Está bellamente elaborado y te proporcionará una protección excelente. -enhanced lion shield=escudo de león mejorado -An enhanced lion shield glints at you. It will defend you well.=Un escudo de león mejorado emite destellos hacia ti. Te defenderá bien. -skull shield=escudo de calavera -The face of a skull scowls at you from this fearsome skull shield.=La cara de una calavera te frunce el ceño desde este temible escudo de calavera -crown shield=escudo de la corona -You see a mighty crown shield. It is in perfect condition.=Ves un poderoso escudo de la corona. Esta en perfectas condiciones. -red shield=escudo rojo -You see a red shield. It is a stunning shade of scarlet.=Ves un escudo rojo. Es de un imponente tono escarlata. -blue shield=escudo azul -You see a blue shield. It feels light in your hand but is strong enough for excellent protection.=Ves un escudo azul. Notas en tu mano que es ligero pero es lo bastante resistente como para proporcionar una excelente protección. -elvish shield=escudo élfico -You see an elvish shield. It looks like one big tree leaf!=Ves un escudo élfico ¡Se parece a una gran hoja de árbol! -golden shield=escudo de oro -You see a golden shield, could it be the ultimate in defense?=Ves un escudo de oro, ¿podría ser lo último en defensa? -green dragon shield=escudo de dragón verde You see an green dragon shield, scaly and strong.=Ves un escudo de dragón verde, escamoso y resistente. -shadow shield=escudo de sombra -You see a shadow shield. Rather than reflecting light, it seems to absorb it.=Ves un escudo de sombra. En lugar de reflejar la luz, parece absorberla. -mainio shield=escudo de mainio -You see a strange looking mainio shield. You have no idea what it's made of, but it seems to protect you well by distracting your enemies.=Ves un escudo de mainio de extraña apariencia. No tienes ni idea de lo que está hecho, pero parece que te protege bien al distraer a tus enemigos. -chaos shield=escudo del caos -You see a chaos shield. Its charming appearance will fool your enemies.=Ves un escudo del caos. Su encantadora apariencia engañará a tus enemigos. -magic plate shield=escudo mágico de placas de acero You see a magic plate shield. Its has a magical quality surrounding it.=Ves un escudo mágico de placas de acero. Tiene una cualidad mágica que lo envuelve. -xeno shield=escudo de xeno -You see a lightweight but strong xeno shield, in the colors of the creature it was looted from.=Ves un escudo de xeno ligero pero resistente, de los mismos tonos que la criatura a la que se le saqueó. -black shield=escudo negro. -You see a black shield. Its darkness will surely protect you.=Ves un escudo negro. Su oscuridad seguro que te protegerá. -mithril shield=escudo de mithril -You see a mithril shield. You will most surely be protected.=Ves un escudo de mithril. Casi con toda seguridad estarás protegido. -lucky charm=amuleto de la suerte -You see a lucky charm. Some believe that it helps their karma in some way, but others think that is superstition.=Ves un amuleto de la suerte. Algunos creen que ayuda a su karma de algún modo, pero otros piensan que es una superstición. -mithril clasp=cierre de mithril -You see a clasp made from mithril, it would provide the fastening for a cloak.=Ves un cierre elaborado a partir de mithril, te proporcionaría la fijación para una capa. -mythical egg=huevo mítico You see a mythical egg, but you do not know, what it is for.=Ves un huevo mítico, pero no sabes, para qué es. -magical eggshells=cáscaras de huevo mágicas -You see shards from a mythical egg. They have magical properties.=Ves fragmentos de un huevo mítico. Tienen propiedades mágicas. -golden gm token=ficha de dj de oro -silvery gm token=ficha de dj de plata -bronze gm token=ficha de dj de bronce -assassin dagger=daga de asesino -You see an assassin dagger, easy to pull out and use when needed.=Ves una daga de asesino, fácil de sacar y de usar cuando se necesite. -knife=cuchillo -You see a blunt knife which looks capable of little damage.=Ves un cuchillo desafilado que parece capaz de hacer poco daño. -night dagger=daga de la noche -You see a night dagger, to be used with stealth.=Ves una daga de la noche, para ser utilizada con sigilo. -obsidian knife=cuchillo de obsidiana You see a knife whose blade is crafted to a lethal edge from finest obsidian.=Ves un cuchillo cuya hoja se ha trabajado hasta conseguir un filo letal a partir de la obsidiana más pura. -soul dagger=daga del alma -You see a soul dagger. It's so light and sharp that you can stab at a very fast rate.=Ves una daga del alma. Es tan ligera y afilada que puedes apuñalar a un ritmo muy rápido. -golden blade=cuchilla de oro -You see the rare and precious golden blade. It can steal life from those you stab with it.=Ves la rara y preciosa cuchilla de oro. Puede robar la vida a aquellos que apuñales con ella. -dagger=daga -You see a dagger, it is little more than decorative but you can jab pretty fast with it.=Ves una daga, es poco más que decorativa pero puedes punzar bastante rápido con ella. -dark dagger=daga oscura -You see a dark dagger. It's designed to be used with a fast motion.=Ves una daga oscura. Se ha diseñado para ser utilizada con un movimiento rápido. -hell dagger=daga del infierno -You see a hell dagger. Is the color that of the burning fires of Hell?=Ves una daga del infierno ¿Es ése el color de las llamas del infierno? -chaos dagger=daga del caos -You see a chaos dagger, it is very lightweight and sharp. It will heal you while hurting them.=Ves una daga del caos, es muy ligera y afilada. -short sword=espada corta -You see a well kept short sword which will be easy to carry as you travel.=Ves una espada corta bien conservada que será fácil de llevar cuando viajes. -r hand sword=espada de mano d -You see r hand sword. It must be used with a left hand sword.=Ves una espada de mano d. Debe usarse con una espada de mano izquierda. -l hand sword=espada de mano i -You see l hand sword. It must be used with right hand sword.=Ves una espada de mano i. Debe usarse con una espada de mano derecha. -sword=espada -You see a sharp sword which might even be worth a little.=Ves una espada afilada que podría incluso valer un poco. -imperator sword=espada imperator -You see a an imperator sword, crafted from you know not what.=Ves una espada imperator, elaborada a partir de ya sabes qué. -scimitar=cimitarra -This scimitar catches the light as you look at it, it will be a powerful weapon.=Esta cimitarra atrapa la luz mientras la miras, sera un arma poderosa. -katana=katana -You see a valuable katana, with a lethal looking blade.=Ves una valiosa katana, con una hoja de apariencia letal. -nihonto=nihonto -You see a samurai's nihonto sword with a razor sharp blade.=Ves una espada nihonto de samurai con una hoja tan afilada como la de una cuchilla. -buster=buster -You see a buster, with its distinctive, oversized blade.=Ves una espada buster, con su distintiva hoja sobredimensionada. -orc sword=espada de orco -You see an orc sword which has a heavy and deadly appearance.=Ves una espada de orco que tiene una apariencia pesada y mortal. -demon sword=espada de demonio -Demon skeletons return from hell with this demon sword.=Los esqueletos demonio regresan del infierno con esta espada de demonio. -vampire sword=espada de vampiro -You see the vampire sword, which will suck life from those you attack with it.=Ves la espada de vampiro, que absorberá la vida de aquellos a los que ataques con ella. -claymore=claymore -This claymore is very hard to lift as it is so heavy. It will be a good weapon if you can swing it.=Esta claymore es muy difícil de levantar ya que es muy pesada. -biting sword=espada mordaz The point of this biting sword is chiseled to a lethal point. It will serve you well.=La punta de esta espada mordaz está cincelada hasta un punto letal. -fire sword=espada de fuego -Flames race along this fire sword as you wield it.=Las llamas corren a lo largo de esta espada de fuego mientras la esgrimes. -ice sword=espada de hielo -You see an ice sword, the blade is lethally cold to the touch, and you know it is one of the best weapons you'll find.=Ves una espada de hielo, la hoja es letalmente fría al tacto, y sabes que es una de las mejores armas que vas a encontrar. -chaos sword=espada del caos The chaos sword. It hurts them but it heals you.=La espada del caos. Les hace daño a ellos pero a ti te cura. -broadsword=espada ancha -You see a mighty broadsword. Enemies will see their death.=Ves una poderosa espada ancha. Los enemigos verán su muerte. -golden orc sword=espada de oro de orco -You see a golden orc sword, with its heavy and deadly appearance it seems also valuable.=Ves una espada de oro de orco, con su pesada y mortal apariencia parece tan valiosa. -elvish sword=espada élfica This an elvish sword. It looks like it is made from tree leaves!=Esta es una espada élfica ¡Parece que está hecha de hojas de árbol! -drow sword=espada drow -This is a genuine drow sword.=Esta es una genuina espada drow. -great sword=gran espada -This rare great sword is heavy and of good craftsmanship. It can only attack incredibly slowly.=Esta rara gran espada es pesada y de buena fabricación. -orcish sword=espada orca -This orcish sword is badly done and weighs a lot.=Esta espada orca está mal hecha y pesa un montón. -immortal sword=espada inmortal -This immortal sword is a gift of gods to the chosen one. It is heavy and of exquisite craftsmanship.=Esta espada inmortal es un regalo de los dioses al elegido. Es pesada y de una elaboración exquisita. -xeno sword=espada de xeno -You wield a xeno sword. Despite the great strength it is strangely light.=Tu esgrimes una espada de xeno. A pesar de su gran potencia es extrañamente ligera. -black sword=espada negra You see a black sword. Its darkness will surely protect you.=Ves una espada negra. Su oscuridad seguro que te protegerá. -demon fire sword=espada de fuego de demonio -The demon fire sword, a horrible sword taken from hell's deepest dungeons.=La espada de fuego de demonio, una espada horrible sacada de las más profundas mazmorras del infierno. -arrow game token=ficha del juego de la flecha -You see a token, that when placed in the right spot could point you in the right direction.=Ves una ficha, que cuando se coloque en el lugar correcto podría señalarte la dirección correcta. -o board token=ficha del tablero o -You see an O token.=Ves una ficha O -x board token=ficha del tablero x -You see an X token.=Ves una ficha X -food mill=molino de alimentos -You see a food mill. It is the traditional tool to mill food.=Ves un molino de alimentos. Es la herramienta tradicional para moler alimentos. -sugar mill=molino de azúcar -You see a sugar mill. You can obtain sugar if you grind canes with it.=Ves un molino de azúcar. Puedes obtener azúcar si mueles cañas con él. -scroll eraser=pergamino borrador -You see a scroll eraser. Put a marked scroll in the opposite hand to clean the scroll.=Ves un pergamino borrador. Pon un pergamino marcado en la mano opuesta para limpiar el pergamino. -pestle and mortar=maza y mortero -You see a pestle and mortar. This is the traditional tool to pound herbs, food and other substances.=Ves una maza y un mortero. Esta es la herramienta tradicional para machacar hierbas, alimentos y otras sustancias. -gold pan=sartén del oro -You see a gold pan. It is the traditional tool to prospect for gold.=Ves una sartén del oro. Es la herramienta tradicional para buscar oro. -fishing rod=caña de pescar -You see a fishing rod. If you find a fishing spot you can catch fish with it.=Ves una caña de pescar. Si encuentra un lugar para pescar puedes capturar peces con ella. -magical scissors=tijeras mágicas. -You see a sparkling pair of magical scissors. Just think what they could cut!=Ves un par de tijeras mágicas centelleantes ¡Piensa sólo en lo que podrían cortar! -magical needle=aguja mágica -You see a magical needle with a very sharp point.=Ves una aguja mágica con una punta muy afilada. -pick=pico You see a pick. It is a tool which helps you to get some coal.=Ves un pico. Es una herramienta que te ayuda a obtener algo de carbón. -albino elf swordsman=espadachín elfo albino -albino elf archer=arquero elfo albino -albino elf magician=mago elfo albino -albino elf queen=reina elfa albina -albino elf king=rey elfo albino -amazoness archer=arquera amazona -You see an amazoness archer. She handles her bow quite well and her arrows are very dangerous when she shoots them at you out of the forest!=Ves a una arquera amazona ¡Maneja su arco bastante bien y sus flechas son muy peligrosas cuando las dispara hacia ti desde el bosque! -amazoness hunter=cazadora amazona -You see an amazoness hunter. She creeps through the forest to hunt animals. But she doesn't like that you are in her hunting area!=Ves a una cazadora amazona ¡Se arrastra por el bosque para cazar animales ¡Pero no le gusta que estés en su zona de caza! -amazoness coastguard=guardacostas amazona -amazoness archer commander=arquera comandante amazona -amazoness elite coastguard=guardacostas de élite amazona -amazoness bodyguard=guardaespaldas amazona -amazoness coastguard mistress=guardacostas Maestre amazona -amazoness commander=comandante amazona -amazoness vigilance=vigilante amazona -You see an amazoness vigilance. Her senses are well tuned, so you have to be very silent when you don't want her to hear you!=Ves a una vigilante amazona ¡Sus sentidos están muy desarrollados, así que tienes que ser muy silencioso cuando no quieras que te oiga! -amazoness imperator=imperator amazona -deer=ciervo -You see a defenseless deer, do not have fear of it.=Ves un ciervo indefenso, no le tengas miedo. -crab=cangrejo -You see a little crab that comes from the beach, be careful of its pincers.=Ves un pequeño cangrejo que viene de la playa, ten cuidado con sus pinzas. click-clack-click=clic-clac-clic -bat=murciégalo -You see a bat, it will seek your blood, don't be distracted...=Ves un murciégalo, buscará tu sangre, no te distraigas... -chicken=pollo You see a chicken, isn't it nice?.=Ves un pollo, ¿a que es bonito? cluck cluck cluck=cloc cloc cloc cluck cluck=cloc cloc -penguin=pingüino -You see a penguin, smart and silly.=Ves un pingüino, bobo y elegante Oou! Oou!=Oou! Oou! *flap* *flap*=*flap* *flap* -pigeon=paloma -You see a pigeon, it loves the little seeds.=Ves una paloma, le encantan las semillas pequeñas. -monkey=mono -You see a monkey, would you like to offer it a banana?=Ves un mono, ¿Te gustaría ofrecerle un plátano? Aooooooouuhhh!!=Aooooooouuhhh!! -boar=verraco -You see a boar, they are pretty wild!=Ves un verraco, ¡son bastante salvajes! Oink!!=Oink!! -wolf=lobo -You see a wolf. It is wild and very hungry!=Ves un lobo ¡Es salvaje y está muy hambriento! Aooooooouuhhh!!=Aooooooouuhhh!! -big bad wolf=lobo grande y malo -You see a big bad wolf. It is really wild, hungry and really dangerous!=Ves un lobo grande y malo ¡Es verdaderamente salvaje, está hambriento y es realmente peligroso! Aooooooouuhhh!!=Aooooooouuhhh!! -fox=zorro -You see a fox, it becomes extinct!=Ves un zorro, ¡se esta extinguiendo! -caiman=caimán -You see a caiman, which is hidden in the water.=Ves un caimán, que está escondido en el agua. Grrr Grrr!=Grrr Grrr! -babybear=cachorro de oso -You see a babybear, isn't it sweet?=Ves un cachorro de oso, ¿a que es dulce? Roar!=Roar! -panda=panda -You see a panda which comes from an exotic land.=ves un panda que viene de una tierra exótica. Roar!=Roar! -snake=serpiente -You see a snake, it came from the forest to poison you!=Ves una serpiente, ¡vino desde el bosque a envenenarte! SsSssSsssssss!=SsSssSsssssss! -bear=oso -You see a bear. You are lucky and found it awake.=Ves un oso. Has tenido suerte y lo has encontrado despierto. Roar!=Roar! -lion=león -You see a lion, dangerous and hungry...=Ves un león, peligroso y hambriento... Grooooaaaarrrr!=Grooooaaaarrrr! -elephant=elephant -You see an elephant, a huge animal with lots of ham and meat. Are you sure that you want to attack it?=Ves un elefante, un animal enorme con un montón de jamón y de carne. WHOOOOEOEOEZZZZZZ!!!=WHOOOOEOEOEZZZZZZ!!! -tiger=tigre -You see a tiger, which likes deer and human meat.=Ves un tigre, al que le gustan los ciervos y la carne humana. Miiiiaaauuu!=Miiiiaaauuu! -killer bat=murciégalo asesino -You see a killer bat which will suck your blood!=¡Ves un murciégalo asesino que te chupará la sangre! -green slime=baba verde -You see a green slime, sticky and shiny.=Ves una baba verde, pegajosa y brillante. -black bear=oso negro -You see a strong black bear which hibernates in winter.=Ves un fuerte oso negro que hiberna en invierno. ROOOOAAAAR!=ROOOOAAAAR! -brown slime=baba marrón -You see a brown slime, sticky and hungry.=Ves una baba marrón, pegajosa y hambrienta. -spider=araña -You see a spider. It makes a giant spider web to trap you!=Ves una araña ¡Está haciendo una telaraña gigante para atraparte! -black slime=baba negra -You see a black slime, with a sticky trail behind it.=Ves una baba negra, que va dejando un rastro pegajoso. -poisonous spider=araña venenosa -You see a poisonous spider. Be careful! Its poison is very strong! It will make you very weak and can probably kill you!=Ves una araña venenosa ¡Ten cuidado! ¡Su veneno es muy fuerte! ¡Te debilitará y probablemente puede matarte! -twilight slime=baba del crepúsculo -You see a twilight slime, so strange and beautiful. Why is it coming towards you? Runnnnnnnnn!=Ves una baba del crepúsculo, tan extraña y bella ¿Por qué se está acercando hacia ti? ¡Correeeeeeeee! -young beholder=joven beholder -You see a young beholder. His huge eye will find you everywhere!=Ves un joven beholder ¡Su ojo gigante te encontrará en cualquier lugar! Defend yourself! I can see you!=¡Defiendete! ¡Puedo verte! -beholder=beholder You see a beholder which can see you very well with its huge eye...=Ves un beholder que puede verte muy bien con su enorme ojo... -elder beholder=beholder anciano -You see an elder beholder, his nasty eye will scare you.=Ves un beholder anciano, su desagradable ojo te asustará. -chaos soldier=soldado del caos -chaos warrior=guerrero del caos Defy order! Seek chaos!=¡Desafía al orden! ¡Busca el caos! -chaos commander=comandante del caos Chaos in the wrath!=¡El caos en la ira! -chaos sorcerer=hechicero del caos I will summon chaos and fury upon you!=¡Invocaré el caos y la furia sobre ti! -chaos dragonrider=jinete de dragón del caos -You see a chaos dragonrider. He is very well trained in dragon riding, but he can also fight well on the ground.=Ves a un jinete de dragón del caos. Está muy bien entrenado en montar a dragón, pero también puede luchar bien en el suelo. -chaos lord=señor del caos Chaos will rule!=¡El caos reinará! -chaos overlord=gran señor del caos You see a chaos overlord. It is he who directs the creation of evil plans and gives orders to all chaotic creatures which exist.=Ves a un gran señor del caos. Es él quien dirige la creación de los planes malvados y da las órdenes a todas las criaturas que existen. I am become death, destroyer of worlds.=Me he convertido en la muerte, en el destructor de mundos. -chaos pawn=peón del caos -You see a pawn for a game of chess. He will drop nothing if you kill him.=Ves un peón para una partida de ajedrez. No dejará caer nada si lo matas. -chaos rook=torre del caos -You see a rook for a game of chess. He will drop nothing if you kill him.=Ves una torre para una partida de ajedrez. No dejará caer nada si la matas. -chaos knight=caballo del caos -You see a knight for a game of chess. He will drop nothing if you kill him.=Ves un caballo para una partida de ajedrez. No dejará caer nada si lo matas. -chaos bishop=alfil del caos -You see a bishop for a game of chess. He will not reward you if you kill him.=Ves un alfil para una partida de ajedrez. No te recompensará con nada si lo matas. -chaos king=rey del caos -You see a king of a game of chess. He will reward nothing if you kill him.=Ves un rey para una partida de ajedrez. No te recompensará con nada si lo matas. -chaos queen=reina del caos -You see a queen piece for a game of chess. She will reward nothing if you kill her.=Ves una pieza reina para una partida de ajedrez. No te recompensará con nada si la matas. pirate=pirata You see a bandit. Together with his partners he commits many different crimes to get much money or some rare and valuable items.=Ves a un bandido. Junto a sus compañeros comete muy diversos crímenes para conseguir mucho dinero o algunos objetos raros y valiosos. Aye, my hearties!=¡Sí, mis valientes! @@ -996,606 +3011,155 @@ pirate leader=líder de los piratas Be quiet or I will lock you on my ship, just like I locked up the girl Susi!=¡Estate quieto o te encerraré en mi barco, como encerré a esa niña llamada Susi! You remind me of the Ados girl we stole to clean our ship!=¡Me recuerdas a la niña de Ados que robamos para que limpie nuestro barco! You'd make a nice playmate for the Susi girl on our ship...=Serías un buen compañero de juegos para la niña llamada Susi en nuestro barco... -child dark elf=niño elfo oscuro -You see a child dark elf. You should know that dark elves are already quite strong and intelligent when they are children. Don't think you can fight him so easily!=Ves a un niño elfo oscuro. Deberías saber que los elfos oscuros son ya bastante fuertes e inteligentes cuando son niños ¡No creas que puedes enfrentarte a él tan fácilmente! -dark elf archer=arquero elfo oscuro -dark elf=elfo oscuro -dark elf elite archer=arquero de élite elfo oscuro -dark elf captain=capitán elfo oscuro Think not to defy the dark elves!=¡No pienses en desafiar a los elfos oscuros! -dark elf knight=caballero elfo oscuro -dark elf general=general elfo oscuro We will never return to the light!=¡Nunca regresaremos a la luz! -dark elf wizard=mago elfo oscuro The Spider Queen will avenge me!=¡La Reina Araña me vengará! -dark elf viceroy=virrey elfo oscuro Keep away from me, sunlight dweller!=¡Alejate de mí, morador de la luz! -dark elf ranger=explorador elfo oscuro Keep away from me, sunlight dweller!=¡Alejate de mí, morador de la luz! -dark elf sacerdotist=sacerdotisa elfa oscura The Queen of Spiders will take her revenge on you!=¡La Reina de las Arañas consumará su venganza sobre ti! -dark elf admiral=almirante elfo oscuro Fear the dark elf armies!=¡Temed a los ejércitos de los elfos oscuros! We are the darkness you fear!=¡Somos la oscuridad que temes! -dark elf master=Maestre elfo oscuro You will never see the light again!=¡No volverás a ver la luz! Darkness will fall upon you!=¡La oscuridad caerá sobre ti! -dark elf matronmother=matrona madre elfa oscura You disturbed my rest!=¡Has perturbado mi descanso! Now, you will pay.=Ahora, lo pagarás. -imp=diablillo -You see an imp. He may look a little bit cute, but don't forget he is one of the devil's servants!=Ves a un diablillo¡ Puede parecer un poquito lindo, pero no olvides que es uno de los siervos del demonio! -winged blue imp=diablillo azul alado -demon=demonio -You see a demon. He personifies evil.=Ves un demonio. Personifica el mal. -imperial demon servant=sirviente demonio imperial -imperial demon lord=señor demonio imperial -dwarf=enano -You see a dwarf who works in the mine to find some iron for us.=Ves a un enano que trabaja en la mina para encontrar un poco de hierro para nosotros. -dwarf guardian=guardián enano -You see a dwarf guardian who fights against the humans.=Ves a un guardián enano que lucha contra los humanos. -elder dwarf=enano anciano -You see an elder dwarf, a mighty warrior tired of fighting.=Ves a un enano anciano, un poderoso guerrero cansado de luchar. -hero dwarf=héroe enano -You see a hero dwarf. He is an old dwarf warrior who became a hero for fighting in many dwarf wars and he is very famous for his strength and brutality.=Ves a un héroe enano. Es un viejo guerrero enano que se convirtión en héroe por luchar en muchas guerras de enanos y es muy famoso por su fuerza y brutalidad. -duergar=duérgar -duergar axeman=hachero duérgar -leader dwarf=líder de los enanos -You see a leader dwarf. He is the most mighty dwarf of his tribe so he enjoys much popularity there.=Ves a un líder de los enanos. Es el enano más poderoso de su tribu así que disfruta de una gran popularidad allí. -elder duergar=duérgar anciano -duergar elite=duérgar de élite -duergar hero=héroe duérgar We mighty duergars will crush the dwarves!=¡Nosotros los poderosos duérgars aplastaremos a los enanos! -duergar wizard=mago duérgar -mountain dwarf=enano de montaña -You see a mountain dwarf. He likes earth, stones and rocks. Deep within the mountain, where no animal and no human has ever been, you can hear the sound of his pickaxe as he searches for gold and ore.=Ves a un enano de montaña. Le gusta la tierra, las piedras y las rocas. En lo profundo de la montaña, donde ningún animal ni ser humano ha estado nunca, puedes oir el sonido de su piqueta mientras busca mineral de oro y de hierro. -mountain dwarf guardian=guardián enano de montaña -You see a mountain dwarf guardian. He has to watch out for enemies and guards the mountain dwarfs while they are doing their work.=Ves a un guardián enano de montaña. Tiene que estar alerta de los enemigos y protege las montañas enanas mientras ellos hacen su trabajo. -black duergar=duérgar negro Dwarves are the enemy ... but we kill all who cross our path!=Los enanos son el enemigo... ¡pero matamos a quien se cruza en nuestro camino! -mountain elder dwarf=enano de montaña anciano -You see a mountain elder dwarf. For many years he worked deep in the mountain and found much gold and ore in his life. Soon he will be too old to do this work but at the moment he is still a strong dwarf.=Ves a un enano de montaña anciano. Durante muchos años trabajó en lo profundo de la montaña y encontró mucho mineral de oro y de hierro en su vida. Pronto será demasiado viejo para hacer este trabajo pero por el momento todavía es un enano fuerte. -mountain hero dwarf=héroe enano de la montaña -You see a mountain hero dwarf. Many, many dwarves admire him! He was a member of a dwarvish group which discovered a very big gold deposit!=Ves a un héroe enano de la montaña ¡Muchos, muchísimos enanos le admiran! ¡Fue miembro de un grupo de enanos que descubrió a depósito de oro muy grande! -mountain leader dwarf=líder de los enanos de montaña -You see a mountain leader dwarf. He is responsible for the mountain dwarves and their work, and also for the organization of the guardian troops. But in serious cases he will also fight on his own!=Ves a un líder de los enanos de montaña. Es responsable de las montañas de los enanos y de sus trabajos, y también de la organización de las tropas guardianas ¡Pero en situaciones graves también luchará por sí sólo! -duergar king=rey duérgar -giant dwarf=enano gigante -You see a giant dwarf. It is very hard for him to be a giant dwarf because some of the other dwarves don't really see him as one of them because of his height... But in his big heart he is a dwarf and in a battle he will fight against each enemy!=Ves a un enano gigante. Es muy duro para él ser un gigante por algunos de los otros enanos no le ven realmente como uno de los suyos por su estatura... Pero en su gran corazón se siente un enano y en la batalla luchará contra cada enemigo! -Dhohr Nuggetcutter=Dhohr Nuggetcutter -Lord Durin=Lord Durin -You see the mighty Lord Durin, an ancient dwarf who has led his race through countless battles.=Ves al poderoso Lord Durin, un antiguo enano que ha guiado a su raza a en incontables batallas. Don't call me Friend.=No me llames Amigo. -nymph=ninfa -You see a nymph. She loves nature very much! As you take a look at her she feels disturbed in sun-bathing and talking to the birds, perhaps she was best left alone.=Ves a una ninfa ¡Le gusta muchísimo la naturaleza! Al echarle un vistazo se siente molestada en su tomar el sol y en su hablar con los pájaros, quizá habría sido mejor dejarla a solas. -earth elemental=elemental de tierra -You see an earth elemental. The earth is quaking as it moves over the surface.=Ves a un elemental de tierra. La tierra tiembla mientras se mueve sobre su superficie. -fire elemental=elemental de fuego -You see a fire elemental and hardly can stand the heat.=Ves a un elemental de fuego y apenas puedes soportar el calor. -water elemental=elemental de agua -air elemental=elemental de aire -You see an air elemental and feel a fresh breeze past you.=Ves a un elemental de aire y sientes una fresca brisa que te atraviesa. -ice elemental=elemental de hielo -You see an ice elemental and sense a shiver on your spine.=Ves a un elemental de hielo y sientes un escalofrío en tu columna vertebral. -djinn=djinn -You see a djinn. He isn't caught in a bottle or lamp so someone must have let him free and gave him the order to kill you.=Ves a un djinn. No está atrapado en una botella o lámpara así que alguien debe de haberle soltado y le dió la orden de matarte. -elf=elfo -You see an elf which loves the forest and lives in peace.=Ves a un elfo al que le encanta el bosque y que vive en paz. -militia elf=elfo de la milicia -You see a militia elf which trains hard to beat you!=¡Ves a un elfo de la milicia que se entrena duramente para vencerte! -archer elf=arquero elfo -You see an archer elf which can do much damage with its wooden arrows.=Ves a un arquero elfo que puede hacer mucho daño con sus flechas de madera. -soldier elf=soldado elfo -You see a soldier elf, a good partner of the militia elves.=Ves a un soldado elfo, un buen compañero de la milicia de los elfos. -mage elf=maga elfa -You see a mage elf. She can feel pure magic when she stands outside in the forest and just frees her mind.=Ves a una maga elfa. Se puede sentir magia pura cuando se encuentra fuera en el bosque y simplemente libera su mente. -commander elf=comandante elfo -You see a busy commander elf. He has control over the army of elves.=Ves a un ocupado comandante elfo. Tiene el control del ejército de los elfos. -archmage elf=archimaga elfa -You see an archmage elf. She is pretty.=Ves a una archimaga elfa. Es guapa. -elf sacerdotist=sacerdotisa elfa -elf wizard=mago elfo -You see an elf wizard. He is a very wise elf who knows almost every kind of magic. He likes to use nature spells to make every plant and creature fertile, but he is also able to defend himself when he has to do.=Ves a un mago elfo. Es un elfo muy sabio que sabe casi cualquier tipo de magia. Le gusta usar hechizos de la naturaleza para hacer a cualquier planta o animal fértil, pero también es capaz de defenderse cuando tiene que hacerlo. -elf bodyguard=guardaespaldas elfo -ent=ent -You see an ent. First you think it is a tree but you will get a surprise when it starts to walk!=Ves a un ent !Primero piensas que es un árbol pero te llevas una sorpresa cuando empieza a caminar! -old ent=ent viejo. -You see an old ent. It has seen many years passing by and survived a lot of storms. You can see that it is very old because it has already lost all of its leaves and most of its bark is broken...=Ves a un viejo ent. Ha visto muchos años pasar y ha sobrevivido a muchas tormentas. Puedes ver que es muy viejo porque ya ha perdido todas sus hojas y la mayor parte de su corteza está rota... -entwife=esposaent -You see an entwife. It is stronger than an ent and lives in a group in an ancient forest.=Ves a una esposaent. Es más fuerte que un ent y vive en grupo en un bosque antiguo. -leprechaun=leprechaun -You see a leprechaun, you would be lucky if you found his treasure.=Ves a un leprechaun, tendrías suerte si encontrases su tesoro. They're always after my Lucky Charms!!=¡¡Siempre van en busca de mis Amuletos de la Suerte!! Clovers and rainbows... stars and horseshoes...=Tréboles y arco iris... estrellas y herraduras... -littlefairy=hadita -You see a little fairy, which is magical and nice.=Ves a una hadita, que es mágica y preciosa. -clurichaun=clurichaun -You see a clurichaun. He is rich, but you don't know if you are able to find his gold!=Ves a un clurichaun. Es rico, pero no sabes si serás capaz de encontrar su oro! Join me for a drink, lassie?=¿Te tomas una copa conmigo, muchacha? Floating blue balloons...=Globos azules flotando... -baby angel=bebé angel -You see a baby angel. Will it ever get a chance to grow up?=Ves a un bebé angel ¿Tendrá alguna vez la oportunidad de hacerse mayor? I want to grow to be mighty!=¡Quiero crecer para ser poderoso! -chick=pollito -You see a little chick, it doesn't like to be away from its mother.=Ves un pequeño pollito, no le gusta estar lejos de su madre. peep peep=pip pip peep peep peep=pip pip pip -piglet=cerdito -You see a piglet, a bit dirty.=Ves un cerdito, un poco sucio. oink=oink oink oink=oink oink shnuffle=shnuffle -mother hen=madre gallina -You see a mother hen, she will probably hurt you if you touch her sons.=Ves una madre gallina, probablemente te haga daño si tocas a sus hijos peep peep=pip pip peep peep peep=pip pip pip -ram=carnero -You see a ram, maybe you are able to shear it?=Ves un carnero, ¿quizá seas capaz trasquilarlo? Baaaaaa=Baaaaaa -beaver=castor -You see a beaver. It likes to build dams in the river.=Ves un castor. Le gusta construir presas en el río. -cow=vaca -You see a cow, taste her delicious milk.=Ves una vaca, prueba su deliciosa leche. Moooo moooo mooooooo=Moooo moooo mooooooo mooooo=mooooo -goat=cabra -You see a goat, which is wild and lives in the mountain.=Ves una cabra, que es salvaje y vive en la montaña. -horse=caballo -You see a horse, don't slap it or it will run away!=Ves un caballo, ¡no les des una palmada o saldrá corriendo! neigghhh neigghhh=neigghhh neigghhh -white horse=caballo blanco -You see a white horse, they love to stay with their brown friends.=Ves un caballo blanco, les gusta estar con sus amigos marrones. naayyy=naayyy -bull=toro -You see a bull, run away!!!=Ves un toro, ¡sal corriendo! MOOOOO!!!=MOOOOO!!! -grass snake=serpiente de hierba -You see a grass snake which is quite dangerous.=Ves una serpiente de hierba que es bastante peligrosa. sssSSSsssss...=sssSSSsssss... -frogman=hombre-rana -You see a frogman which lives in a lake which isn't very deep.=Ves a un hombre-rana que vive en un lago no muy profundo. -elite frogman=hombre-rana de élite -wizard frogman=mago hombre-rana -gargoyle=gárgola -You see a gargoyle, You should think that it is a statue, but no, it is alive!=Ves a una gárgola, Pensarías que es una estatua, pero no, ¡está viva! -elder gargoyle=gárgola anciana -You see an elder gargoyle, it is wise...=Ves a una gárgola anciana, es sabia... -dark gargoyle=gárgola oscura -You see a dark gargoyle, do you feel the fear?=Ves a una gárgola oscura, ¿sientes el miedo? -venom gargoyle=gárgola de veneno -You see a venom gargoyle, a hideous and poisonous creature.=Ves a una gárgola de veneno, una criatura horrible y venenosa. -cyclops=cíclope -You see a cyclops. It just has one eye.=Ves a un cíclope. Sólo tiene un ojo. -ogre=ogro -You see an ogre, it is nude and rude!=Ves a un ogro, ¡está desnudo y es rudo! -elder ogre=ogro anciano -You see an elder ogre, he's in the last moments of his life, take pity on him.=Ves a un ogro anciano, está en los últimos momentos de su vida, ten compasión de él. -ogre soldier=soldado ogro -You see an ogre soldier, smelling like it didn't have had a bath for years. Ewww.=Ves a un soldado ogro, huele como si no se hubiese bañado durante años. Puaj! -superogre=superogro -giantrat=ratagigante -You see a giant rat. It seems like it survived from an experiment which went wrong.=Ves una rata gigante. Parece que haya sobrevivido a un experimento que salió mal. -crocodile=crocodilo -You see a crocodile, it arises from the deep waters in the rivers.=Ves un crocodilo, surge de las aguas profundas de los ríos. Rrrrrrrrr=Rrrrrrrrr -dwarf golem=golem enano -You see a dwarf golem. A long time ago a dwarf got turned into a big rock by some mystical forces. To save their friend the other dwarves created a golem out of this rock! From this day the dwarf golem lives together with them.=Ves a un golem enano. Hace mucho tiempo un enano fue convertido en una gran roca por unas fuerzas místicas. Para salvar a su amigo los otros enanos crearon un golem ¡a partir de esta roca! Desde este día el golem enano convive con ellos. -giant=gigante Fee Fie Foe Fum!!= ¡¡Fi Fa Fo Fum!! I seek the blood of a Semos Man!=¡Busco la sangre de un Hombre de Semos! -elder giant=gigante anciano -You see an elder giant. For many years he lived alone and had to hide because he was hunted by humans! Now he is old and has decided not to hide any longer because he wants to see something else in his life.=Ves a un gigante anciano. Durante muchos años vivió sólo y tuvo que esconderse ¡porque era cazado por los humanos! Ahora es viejo y ha decidido no esconderse por más tiempo porque quiere ver otra cosa más en su vida. Gnomes! Run away!=¡Gnomos! ¡Huyamos! You may steal my money but you'll never take my heart!=¡Podéis robarme mi dinero pero nunca me robaréis mi corazón! -master giant= Maestre gigante Thou shalt die!= ¡Morirás! Worms will feast on your corpse!= ¡Los gusanos se darán un festín con tu cadáver! -ice giant=gigante de hielo -You see an ice giant. His skin is covered with frozen hoarfrost and his breath feels like the cold north wind.=Ves a un gigante de hielo. Su piel está cubierta de escarcha helada y su aliento se siente como el frío viento del norte. -amazoness giant=giganta amazona -You see an amazoness giant. She looks very beautiful but don't be deceived by that!=Ves a una giganta amazona ¡Parece muy hermosa pero no te dejes engañar por eso! -fallen angel=ángel caído -You see a fallen angel. When he turned away from good, he fell down from heaven.=Ves a un ángel caído. Cuando se apartó del bien, se cayó del cielo. You are DOOMED.=Estás CONDENADO I am here to destroy all people.=Estoy aquí para destruir a toda la gente. -black giant=gigante negro Who dare challenge me?=¿Quién se atreve a desafiarme? Leave me now, before it is too late!=¡Marchaos ahora, antes de que sea demasiado tarde! -angel=ángel -You see an angel. With his flame sword he guards the way and doesn't let you pass.=Ves a un ángel. Con su espada flamígera protege el camino y no te deja pasar. Meet thy maker!=¡Conoce a tu creador! Mere mortals cannot challenge me!=¡Los simples mortales no pueden desafiarme! -archangel=arcángel You see an archangel. She wants to kill you because she doesn't want you in the clouds.=Ves a una arcángel. Quiere matarte porque no quiere que estés en las nubes. Leave now, before it is too late for you.=Marchate ahora, antes de que sea demasiado tarde para ti. Your destiny is not here.=Tu destino no está aquí. Neither the earth nor the sky has a place for you...=Ni la tierra ni el cielo tienen un lugar para ti... -dark angel=ángel oscuro -You see a dark angel. He is an strong evil angel, and for now he is under cover of darkness.=Ves a un ángel oscuro. Es un ángel poderoso y malvado, y por ahora está al amparo de la oscuridad. My will be done over land and sky!=¡Mi voluntad se hará en la tierra y en el cielo! Mine is the Power and the Glory!=¡Mío es el poder y la gloria! -dark archangel=arcángel oscuro You see a dark archangel, after she fell from heaven her soul became as dark as she is now.=Ves a una arcángel oscura, después de que cayese del cielo su alma se volvió tan oscura como ella lo es ahora. I will strike you down with more power than you can imagine!!= ¡¡Yo te derribaré con más poder del que puedas imaginar!! My will be done!=¡Mi voluntad se hará! -gnome=gnomo -You see a gnome who lives in the mountains.=Ves a un gnomo que vive en las montañas. Giiiiiaaants! Run away!=¡Giganteeeeees! ¡Huyamos! -mage gnome=mago gnomo -You see a mage gnome, she cleans the dirty mountain.=Ves a una maga gnoma, ella limpia la sucia montaña. Giiiiiaaants! Run away!=¡Giganteeeeees! ¡Huyamos! -infantry gnome=gnomo de infantería -You see an infantry gnome who will protect his little town against the humans!=Ves a un gnomo de infantería que protegerá su pequeña aldea frente a ¡los humanos! Ready! Aim! Runnnnnnnnnnn=¡Preparados! ¡Apunten! ¡Corraaaaaaaaaaaan! -cavalryman gnome=soldado de caballería gnomo -You see a cavalryman gnome who does long travels to search for gold.=Ves a un soldado de caballería gnomo que realiza largos viajes en busca de oro. Ready! Aim! Runnnnnnnnnnn=¡Preparados! ¡Apunten! ¡Corraaaaaaaaaaaan! -goblin=goblin -You see a goblin, it is an evil and mischievous creature.=Ves a un goblin, es una criatura malvada y maliciosa. Umm! Tasty meat.=¡Umm! Carne sabrosa. -veteran goblin=veterano goblin -You see a veteran goblin, an old warrior...=Ves a un goblin veterano, un viejo guerrero... Breakfast time!=¡Hora de desayunar! -soldier goblin=soldado goblin -You see a soldier goblin, a young warrior.=Ves a un soldado goblin, un joven guerrero. -wooden golem=golem de madera -You see a wooden golem. The scroll with ancient words in his head keeps it walking.=Ves a un golem de madera. El pergamino con las antiguas palabras en su cabeza lo mantiene caminando. -stone golem=golem de piedra You see a stone golem, it exists to protect and nothing else. What was it crafted to protect, and what would one do if it lost it's purpose?=Ves a un golem de piedra, existe para proteger y nada más ¿Qué fue diseñado para proteger, y qué haría si perdiese su propósito? -ice golem=golem de hielo -green dragon=dragón verde -giant kobold=kobold gigante You see a giant kobold. Though generally playful it doesn't quite know it's own strength. When it asks for a hug, it's best to decline that offer.=Ves a un kobold gigante. Aunque por lo general es juguetón no conoce su propia fuerza. Cuando pide un abrazo, es mejor rechazar la oferta. Hug?=¿Un abrazo? -bone dragon=dragon de hueso -You see a bone dragon. It's been said that there are creatures with enough will to live that their souls still cling to life even as their flesh and blood has failed them. This is living proof.=Ves a un dragón de hueso. Se dice que hay criaturas con la suficiente voluntad de vivir como para que sus almas todavía se aferren a la vida aún cuando su carne y su sangre les han abandonado. -blue dragon=dragón azul -You see a blue dragon. It has a very beautiful blue skin which shimmers mysteriously in the light. But don't forget that it also has claws and teeth!=Ves a un dragón azul. Tiene un tono de piel azul muy bonito que brilla misteriosamente en la luz¡Pero no olvides que también tiene garras y dientes! -giant spider=araña gigante -You see a giant spider. It has very long legs which are quite dangerous.=Ves a una araña gigante. Tiene patas muy largas que son bastante peligrosas. -red dragon=dragón rojo -flying golden dragon=dragón de oro volador -You see a flying golden dragon. As it spreads its mighty wings you shiver... this mystical creature seems to have much power in it!=Ves a un dragón de oro volador. A medida que extiende sus poderosas alas te estremeces... ¡esta criatura mística parece tener mucho poder en su interior! -twin headed dragon=dragón de dos cabezas -You see a twin headed dragon. The two heads are staring at you with their four eyes!=Ves a un dragón de dos cabezas ¡Las dos cabezas te están mirando con sus cuatro ojos! -chaos green dragonrider=jinete de dragón verde del caos Wheee!!=¡¡Uiií!! It's fun up here!=¡Es divertido estar aquí arriba! -thing=cosa -You see a thing. It looks like a very mutated human and is so scary that you think it has to come from another world.=Ves a una cosa. Parece un humano muy mutado y es tan espantoso que crees que ha venido de otro mundo. -chaos red dragonrider=jinete de dragón rojo del caos Charrrrrrrrge!=¡A la cargaaaaaaaa! -black death=muerte negra You see black death. With his scythe he reaps your soul and then he takes it over the river where it has to stay until judgement day.=Ves a la muerte negra. Con su guadaña siega tu alma y después se la lleva al río donde tiene que permanecer hasta el día del juicio. Your time to die has come!=¡Ha llegado tu hora de morir! Say goodbye to this world!=¡Di adiós a este mundo! -golden death=muerte de oro -You see the golden death. He came to take your soul away to pay for all your sins.=Ves a la muerte de oro. Vino a llevarse tu alma para que pague por todos tus pecados. You will dream of me tonight...=Soñarás conmigo esta noche... You will pay for your greed!=¡Pagarás por tu codicia! -risecia thug=matón risecia -You see a risecia thug, stay away from him!=Ves a un matón risecia, ¡mantente alejado de él! -risecia archer=arquero risecia -You see a risecia archer, just one of the warriors who wants to protect his chief.=Ves a un arquero risecia, sólo uno más de los guerreros que quieren proteger a su jefe. -risecia swordsman=espadachín risecia -You see a risecia swordsman, the blade of his sword will cut your head!=Ves a un espadachín risecia, ¡la hoja de su espada te cortará la cabeza! -Chief Falatheen of the Risecia=Jefe Falatheen de los Risecia -You see the Chief Falatheen of the Risecia, he doesn't want to die! His little warriors protect him against invaders.=Ves al Jefe Falatheen de los Risecia, ¡no quiere morir! Sus pequeños guerreros le protegen frente a los invasores. -cannibal woman=mujer caníbal -You see a cannibal woman. She wants to make a soup out of your bones!=Ves a una mujer caníbal ¡Quiere hacer una sopa con tus huesos! Zag-Zag!=Zag-Zag! -littlewitch=brujita You see a little witch. Witches are are evil little girls who are very dangerous.=Ves a una brujita. Las brujas son niñitas malvadas que son muy peligrosas. -monk=monje The end of the world is nigh...=El fin del mundo está cerca... Yield to the Power!=¡sometete al poder! Meet you after Cataclysm.=Nos veremos después del Cataclismo. I see you, heretic!=¡Te estoy viendo, hereje! -littlewizard=pequeño mago -You see a little wizard. Although he is a child, he is already able to cast powerful spells.=Ves a un pequeño mago. Aunque es un crío, ya es capaz de lanzar poderosos hechizos. -kalavan housewife=ama de casa kalavan You see a kalavan housewife. She lives in Kalavan city and she very angry with rude people who want to steal her food out of the kitchen and destroy her beautiful flower garden!=Ves a una ama de casa kalavan. Vive en la ciudad de Kalavan y ¡se enfada mucho con la gente ruda que quiere robar comida de su cocina y destruir su precioso jardín! -cannibal=caníbal -You see a cannibal. He hunts you for cooking and eating your fresh meat! It's useless to tell him that your flesh is not good, better fight him or run away!=Ves a un caníbal. Te caza para cocinar y comerse tu carne fresca! Ou-Garrrr!=Ou-Garrrr! -kalavan peasant=campesino kalavan -You see a kalavan peasant. He works in the fields around Kalavan city. As he heard there were strangers in the city he came to help the kalavan citizens in fighting the enemies!=Ves un campesino kalavan. Trabaja en los campos de alrededor de la ciudad de Kalavan. Cuando oyó que había extranjeros en la ciudad vino a ayudar a los ciudadanos de kalavan a luchar contra los enemigos! -kalavan wisewoman=mujer sabia de kalavan -You see a kalavan wisewoman. Normally she sits in her small room and does some handworking but now she wants to have some action!=Ves a una mujer sabia de kalavan. Normalmente se sienta en su pequeña habitación y hace labores manuales pero ahora quiere tener algo de acción! -kalavan citizen=ciudadano de kalavan -You see a kalavan citizen. He lives in kalavan city and tries to protect it from invaders!=Ves a un ciudadano de kalavan. Vive en la ciudad de kalavan ¡e intenta protegerla frente a los invasores! -elder cannibal=caníbal anciano Yummie!=mmmmm! -imperial defender=defensor imperial -bandit=bandido -You see a lean and mean bandit. He's out to get your life and purse!=Ves a un bandido preparado y listo para actuar ¡Hará lo que sea necesario para llevarse tu vida y tu dinero! -imperial veteran=veterano imperial -You see an imperial veteran. He fought in many battles and wars. Now he is old, but over the years he always looked for a new enemy to fight against.=Ves a un veterano imperial. Luchó en muchas batallas y guerras. Ahora es viejo, pero a lo largo de los años siempre ha buscado un nuevo enemigo contra el que luchar. -darkmonk=monje oscuro The Cataclysm cometh!=¡El cometa del Cataclismo! Hail to the greater Power!=¡Salve al Poder supremo! -barbarian=bárbaro -imperial archer=arquero imperial -disciple assassin=discípulo de asesino -You see a disciple assassin. He is quite young but he has learned to fight and kill already.=Ves a un discípulo de asesino. Es bastante joven pero ya ha aprendido a luchar y a matar. I'm gonna tell my mommy.=Se lo voy a decir a mi mamá. Teacher, make him stop.=Seño, digale que pare. My dad can beat your dad.=Mi papá puede ganar a tu papá. -imperial priest=sacerdote imperial -imperial elite guardian=guardián de élite imperial -barbarian wolf=lobo bárbaro -apprentice assassin=aprendiz de asesino -You see an apprentice assassin. He has been taught some very awesome moves and methods, so he is already able to kill an enemy almost perfectly!=Ves a un aprendiz de asesino. Le han enseñado algunos movimientos y métodos muy impresionantes, así que ya es capaz de matar a un enemigo casi perfectamente! Come on, i dare you.=Venga, a ver si te atreves. You want a piece of me?=¿Quieres un pedazo de mí? Any time you're ready.=Cuando estés listo. Bring it on!=¡Adelante! -hunter=cazador I always get my prey!=¡Siempre consigo a mi presa! -barbarian elite=bárbaro de élite -imperial scientist=científico imperial -You see an imperial scientist. He is quite clever but also a little bit crazy and unfortunately he uses his intelligence for evil experiments.=Ves a un científico imperial. Es bastante listo pero también un poquito loco y desafortunadamente usa su inteligencia para experimentos malvados. -barbarian priest=sacerdote bárbaro -imperial high priest=sumo sacerdote imperial -assassin=asesino -You see an assassin. He is very good at killing his victims silently without being seen by anyone.=Ves a un asesino. Es muy bueno matando a sus victimas silenciosamente sin ser visto por nadie. Time to die.=Es hora de que mueras. -barbarian chaman=chamán bárbaro King he say kill!=¡El rey ha dicho que te mate! -imperial archer leader=líder arquero imperial -barbarian leader=líder bárbaro Me destroy you!=¡Yo destruyo tú! -mithrilbourgh soldier=soldado de mithrilbourgh -imperial elite archer=arquero de élite imperial -ninja=ninja -imperial leader=líder imperial -mithrilbourgh archer=arquero de mithrilbourgh -mithrilbourgh knight=caballero de mithrilbourgh -imperial knight=caballero imperial -imperial chief=jefe imperial -mithrilbourgh elite archer=arquero de élite de mithrilbourgh -barbarian king=rey bárbaro -mithrilbourgh sergeant=sargento de mithrilbourgh -samurai=samurai -imperial commander=comandante imperial Our troops will crush you!=¡Nuestras tropas os aplastarán! -mithrilbourgh lieutenant=lugarteniente de mithrilbourgh -mithrilbourgh colonel=coronel de mithrilbourgh -mithrilbourgh wizard=mago de mithrilbourgh -shadows assassin=asesino de las sombras -You see a shadows assassin. He knows how to become one with the shadows and to move in the dark without being seen or making any sound.=Ves a un asesino de las sombras. Sabe como hacerse uno con las sombras y moverse en la oscuridad sin ser visto o hacer ningún sonido. -imperial general=general imperial Our troops will crush you!=¡Nuestras tropas os aplastarán! -mithrilbourgh general=general de mithrilbourgh -emperor dalmung=emperador dalmung My empire is undefeatable!=¡Mi imperio es inderrotable! -blordrough quartermaster=intendente de blordrough We might be in hiding, but we are STILL mighty.=Puede que nos escondamos, pero TODAVÍA somos poderosos. -imperial general giant=general imperial gigante -master assassin=Maestre asesino -You see a master assassin. He is a master of assassination! He is able to kill an enemy without letting him know that he is already there!=Ves a un Maestre asesino ¡Es un maestro del asesinato! ¡Es capaz de matar a un enemigo sin dejar que sepa que ya está allí! You've been warned before.=Ya te había advertido. Why do you return?=¿Por qué has vuelto? Have you lost your marbles?=¿Has perdido tus canicas? -blordrough corporal=cabo de blordrough You WILL show us the respect we deserve.=Tú nos MOSTRARÁS el respeto que merecemos. Care for a game of chess?=¿Te apetece una partida de ajedrez? -blordrough storm trooper=soldado de asalto de blordrough Wipe your feet before entering our domain.=Limpiate los pies antes de entrar en nuestro dominio. I'll teach you to defile our sanctuary.=Te voy a enseñar a profanar nuestro santuario. -tiny skelly=pequeño esqueletito -You see a tiny skelly. It is silly, little and evil, be careful with its poison...=Ves a un pequeño esqueletito. Es tonto, pequeño y malvado, ten cuidado con su veneno... Thou shall not maim!=¡Tú no mutilarás! -brain ahouga=cerebro ahouga -You see a brain ahouga, a very strange creature only living in your dreams!=Ves a un cerebro ahouga, ¡una criatura muy extraña que sólo vive en tus sueños! -red roohako=roohako rojo -robot aruthon=robot aruthon -violet avenger=vengador violeta -googon=googon -You see a googon that comes from the worst place in this world...Be careful this creature is a deadly killer.=Ves a un googon que viene del peor lugar de este mundo... Ten cuidado esta criatura es una asesina mortal. -blue mohiko=mohiko azul -snarfkin=snarfkin -You see a snarfkin, the favorite pet of wizards. Be careful, its claws are poisonous!=Ves a un snarfkin, la mascota favorita de los magos. Ten cuidado, ¡sus garras son venenosas! -dark aruthon=aruthon oscuro -grobble monster=monstruo grobble grobble grubble grobble=grobble grubble grobble gribble grobble grubble=gribble grobble grubble -winged blurble=blurble alado -xenocium=xenocium -necrosophia=necrosophia -arachne=arachne -You see Arachne, a horrid half woman half spider. With so many legs she can hit you very fast, and her poisonous bite is fierce.=Ves a Arachne, un ser horrible mitad mujer mitad araña. Con tantas piernas puede golpearte muy rápido, y su mordedura venenosa es feroz. -kobold=kobold -You see a kobold. People say that it is a mythical spirit.=Ves a un kobold. La gente dice que es un espíritu mítico. Grrrr! Wooof!=Grrrr! Wooof! -soldier kobold=soldado kobold -You see a soldier kobold, he's protecting his king.=Ves a un soldado kobold, está protegiendo a su rey. Woorf wer warf!=Woorf wer warf! -archer kobold=arquero kobold -You see an archer kobold. It runs away from humans.=Ves a un arquero kobold. Sale corriendo de los humanos. Wssss! Warf wit!=Wssss! Warf wit! -veteran kobold=veterano kobold -You see a veteran kobold, it is mighty!=Ves a un veterano kobold, ¡es poderoso! -leader kobold=líder kobold -You see a leader kobold, one of the mighty warriors.=Ves a un líder kobold, uno de los poderosos guerreros. -madaram archer=arquero madaram -madaram peasant=campesino madaram -madaram trooper=soldado de asalto madaram -madaram soldier=soldado madaram -madaram healer=sanador madaram -madaram axeman=hachero madaram -madaram queen=reina madaram -madaram hero=héroe madaram -madaram windwalker=windwalker madaram -madaram cavalry=caballería madaram -madaram stalker=acechador madaram -madaram buster blader=buster blader madaram -madaram pawn=peón madaram -You see a pawn for a game of chess. It will reward nothing if killed.=Ves un peón para una partida de ajedrez. No te recompensará con nada si lo matas. -madaram rook=torre madaram -You see a rook for a game of chess. It will scarcely reward you to kill it.=Ves una torre para una partida de ajedrez. Apenas te recompensará con algo si la matas. -madaram knight=caballo madaram -You see a knight, a chess piece. He won't reward you if you kill him.=Ves un caballo, una pieza de ajedrez. No te recompensará con nada si lo matas. -madaram bishop=alfil madaram -You see a bishop for a game of chess. It will reward you nothing if you slay it.=Ves un alfil para una partida de ajedrez. No te recompensará con nada si lo matas. -madaram king=rey madaram -You see a king to play chess with, he will reward you nothing if you kill him.=Ves un rey para jugar al ajedrez con él, no te recompensará con nada si lo matas. madaram queen =reina madaram -You see a queen piece for a game of chess. She will reward nothing if you kill her.=Ves una pieza reina para una partida de ajedrez. No te recompensará con nada si la matas. -kasarkutominubat=kasarkutominubat -minotaur=minotauro -You see a minotaur. He escaped from his labyrinth and is very angry now!=Ves a un minotauro ¡Ha escapado de su laberinto y ahora está muy enfadado! You will never find the way out!=¡Nunca encontrarás la salida! -minotaur king=rey minotauro I am the king of this area!=¡Soy el rey de esta área! -mummy=momia -You see a mummy which usually sleeps in a coffin.=Ves a una momia que suele dormir en un sarcófago. -royal mummy=momia real -You see a royal mummy. You wonder what keeps this king's soul from finding peace.=Ves a una momia real. Te preguntas qué le impide al alma de este rey encontrar la paz. -glow monster=monstruo del resplandor -dark mutant=mutante oscuro -cat woman=mujer gata -naga=naga -werewolf=hombre lobo -You see a werewolf. Normally he is a human but at fullmoon nights he turns into a dangerous beast! His poison seems to last forever.=Ves a un hombre lobo. Normalmente es un humano pero ¡en las noches de luna llena se convierte en una bestia peligrosa! Su veneno parece durar para siempre. -high naga=naga suprema -imperial experiment=experimento imperial -imperial mutant=mutante imperial Ouurgghh!=Ouurgghh! -armed naga=naga con brazos -black dragon=dragón negro -You see a black dragon. As you see this huge black creature you almost faint! If you concentrate you can feel the deep growling of it in your bones.=Ves un dragón negro ¡Al ver a esta enorme criatura negra casi te desmayas! -balrog=balrog -You see a huge balrog. He is slow hitting, but terribly strong as he stands towering above you.=Ves a un enorme balrog. Es lento en golpear, pero terriblemente potente mientras permanece de pie imponiendose por encima de ti. Growwwwwwwrrrrrrr!=Growwwwwwwrrrrrrr! Arrrrllllggggghhhh=Arrrrllllggggghhhh -gashadokuro=gashadokuro -A giant figure made of bone, known only as gashadokuro, towers before you. He is created from the bones of starving humans.=Una figura gigante hecha de hueso, conocida sólo como gashadokuro, se impone ante ti. Se ha creado a partir de los huesos de humanos muertos de hambre. -unicorn=unicornio -You see a rare unicorn. It is widely believed to be only a myth.=Ves un raro unicornio. En general se cree que es sólo un mito. -centaur=centauro You see a noble centaur, half man, half horse. He looks capable of great damage but thankfully seems to mean you no harm.=Ves a un noble centauro, mitad hombre, mitad caballo. Parece capaz de causar gran daño pero afortunadamente no parece tener intención de herirte. -pegasus=pegaso -You see Pegasus, the winged horse. His name means Lightning and he carries bolts of Thunder.=Ves a Pegasus, el caballo alado. Su nombre significa Relámpago y lleva los rayos del Trueno. -oni warrior=guerrero oni -oni archer=arquero oni -oni priest=sacerdote oni -You see a mysterious oni priest, uttering strange incantations.=Ves a un misterioso sacerdote oni, pronunciando extraños encantamientos. -oni king=rey oni Revere me, the Oni King!=¡Veneradme, al Rey Oni! -oni queen=reina oni You must bow before the Oni Queen.=Debes inclinarte ante la Reina Oni. -orc=orco -You see an orc which is noisy and silly.=Ves a un orco que es ruidoso y tonto. -orc spearman=lancero orco -You see an orc spearman. Run away fast before a spear pierces you.=Ves a un lancero orco. Sal corriendo rápido antes de que una lanza te atraviese. -orc warrior=guerrero orco -You see an orc warrior which doesn't like you searching in the mountain.=Ves a un guerrero orco al que no le gusta que andes buscando en la montaña. -orc hunter=cazador orco -You see an orc hunter. It it seeking for you!=Ves a un cazador orco ¡Te está buscando a ti! -orc chief=jefe orco -You see an orc chief which is too busy to attend to you!=Ves a un jefe orco ¡que está demasiado ocupado para atenderte! -mountain orc=orco de montaña -mountain orc warrior=guerrero orco de montaña -mountain orc hunter=cazador orco de montaña -mountain orc chief=jefe orco de montaña -ratman=hombre rata -You see a ratman. He is a mutation that comes from old times.=Ves a un hombre rata. Es una mutación que procede de tiempos remotos. You, humans, never leave us alone!=¡Vosotros, los humanos, nunca nos dejáis en paz! -ratwoman=mujer rata -You see a ratwoman. She is a mutation of women with the rats in the century XVIII.=Ves a una mujer rata. Es una mutación de mujeres con ratas en el siglo XVIII. You humans never leave us alone!=¡Vosotros los humanos nunca nos dejáis en paz! -archrat=archirrata -You see an archrat. You will be distracted with its aura, be careful...=Ves una archirrata. Te distraerás con su aura, ten cuidado... You're messing with the rats?!=¡¿Te estás metiendo con las ratas?! Your death has come!=¡Tu muerte ha llegado! Feel my wrath!=¡Sufre mi ira! -sheepman=hombre oveja I'm no fluffy lamb!=¡No soy un esponjoso cordero! -armored sheepman=hombre oveja blindado You're baaaarmy to attack me!=¡Estás chiflado al atacarme! -elder sheepman=hombre oveja anciano Bah! Stay away!=¡Bah! ¡Mantente alejado! -elite sheepman=hombre oveja de élite Baaaaack away!= ¡Retrocede! -rat=rata -You see a small rat that seems to be extremely hungry.=Ves una pequeña rata que parece estar extremadamente hambrienta. Squeak! Squeak!=¡Cuic!¡Cuic! -mouse=ratón -You see a small mouse that seems to be very hungry.=Ves un pequeño ratón que parece estar muy hambriento. squeak ... squeak!=¡cuic ... cuic! -caverat=rata de cueva -You see a caverat which is dirty and loves the dungeons.=Ves una rata de cueva que es sucia y le encantan las mazmorras. -razorrat=rata de cuchilla -You see a razorrat, its noise will make you crazy!=Ves una rata de cuchilla, ¡su ruído te hará perder la cabeza! -venomrat=rata de veneno -You see a venomrat, extremely poisonous.=Ves una rata de veneno, extremadamente venenosa. -zombie rat=rata zombi -You see a hungry zombie rat and it doesn't like to see you.=Ves una hambrienta rata zombi y a ella no le gusta verte a ti. SHREEAK!!=SHREEAK!! SHAAAAAAA!!=SHAAAAAAA!! -troll=trol -You see a troll, be careful in his terrain.=Ves a un trol, ten cuidado en su terreno. -red troll=trol rojo -You see a red troll, he's burning with anger.=Ves a un trol rojo, está quemando de ira. -cave troll=trol de cueva Uggga yggga arghhhhh=Uggga yggga arghhhhh Ooggga UGGga arhhh=Ooggga UGGga arhhh -skeleton=esqueleto -You see a skeleton which survives to get revenge.=Ves a un esqueleto que sobrevive para vengarse. Thou shall not pass!=¡No pasarás! -ghost=fantasma -You see a ghost, don't be afraid! It doesn't seem to be evil.=Ves un fantasma, ¡no tengas miedo! No parece ser malvado. Ooooouuuuuh!=Ooooouuuuuh! -ghost hound=perro fantasma -As you catch sight of its shaggy shape and gleaming evil eyes, you suddenly remember all the horror stories around the dreaded ghost hound!=Al avistar su forma peluda y sus malvados ojos brillantes, de repente recuerdas todas las historias de terror acerca del temido perro fantasma! WooOouuuUuh!=WooOouuuUuh! Ghhrr!=Ghhrr! -bloody zombie=zombi sangriento You see a bloody zombie. Can you see the drops of blood that fall from his body?=Ves a un zombi sangriento ¿Puedes ver las gotas de sangre que caen de su cuerpo? brrraaaaaaaaaains=cereeeeeeeebrooooos -zombie=zombi -You see a zombie. It woke up just to take revenge, be silent.=Ves a un zombi. Se despertó solo para vengarse, estate en silencio. -headless monster=monstruo sin cabeza -You see a headless monster, how can he hear that we come to him?=Ves a un monstruo sin cabeza, ¿Cómo ha podido oír que nos acercábamos a él? -warrior skeleton=guerrero esqueleto -You see a warrior skeleton, it's just a normal skeleton with a shield!=Ves a un guerrero esqueleto, ¡es sólo un esqueleto normal con un escudo! Thou shall not kill!=¡No matarás! -elder skeleton=esqueleto anciano Thou shall not survive!=¡No sobrevivirás! -rotten zombie=zombi podrido -You see a rotten zombie. You are disgusted as you see its rotten skin that hangs down in pieces from his half rotten bones.=Ves a un zombi podrido. Estás asqueado al ver su piel podrida que cuelga hecha jirones de sus huesos medio podridos. bluuergghhhoooorrghhhhh=bluuergghhhoooorrghhhhh -death=muerte -You see Death. Do you have the will to stare him in the face? Today he's not in the mood to bargain with your soul.=Ves a la Muerte ¿Tendrás el valor de mirarla a la cara? Hoy no está de humor para negociar con tu alma. Judgement is coming!=¡El juicio se acerca! Uuuuhhhhh!, i'm gonna get you!=¡Uuuuhhhhh!, te voy a coger! -demon skeleton=esqueleto demonio Thou shall not rob!=¡No robarás! -invisible man=hombre invisible -You see nothing but the landscape. As you stare at the point where you think you have seen something, you suddenly see the slight contour of a man!=No ves nada excepto el paisaje. Al mirar fijamente al punto donde crees haber visto algo, de repente ¡ves el ligero contorno de un hombre! My unnatural state should evoke fear in you ...=Mi estado no natural debería evocar el miedo en ti... -death knight=caballero de la muerte -You see a death knight. Some time ago he fought in tournaments where his only aim was to kill as many enemies as possible.=Ves a un caballero de la muerte. Hace algún tiempo luchó en torneos donde su único objetivo era matar tantos enemigos como fuese posible. -devil queen=reina del diablo Who wakes me from my meditation?=¿Quien me ha despertado de mi meditación? You will regret this!=¡Lo lamentarás! -fallen warrior=guerrero caído -green phantom=fantasma verde -lich=lich -You see a lich, a dark desolate creature which has been doomed to wander in endless turmoil, feeding on the souls of the righteous.=Ves a un lich, una criatura oscura solitaria que ha sido condenada a vagar en confusión sin fin, alimentándose de las almas de los justos. -fallen priest=sacerdote caído -incorporeal armor=armadura incorpórea -You see an incorporeal armor. You are quite surprised as it walks towards you because there is nobody in it.=Ves una armadura incorpórea. Te sorprende bastante al caminar hacia ti porque no hay nadie dentro de ella. Thou shall not pillage!=¡No saquearás! -dead lich=lich muerto -fallen high priest=sumo sacerdote caído -high lich=lich supremo -The terrible grinning skull of a high lich leers at you as it prepares to slaughter you in a myriad of magical ways.=La terrible sonrisa de la calavera de un lich supremo te mira de reojo al prepararse para matarte de una miríada de mágicas maneras. -devil monk=monje del diablo -You see a devil monk. He is a member of a devil cult which practises black rituals.=Ves a un monje del diablo. Es miembro de un culto al diablo que practica negros rituales. -vampire bride=novia vampira -You see a vampire bride. She was resurrected from the dead by a wicked vampire lord.=Ves a una novia vampira. Fue resucitada de entre los muertos por un malvado señor vampiro. -vampirette=vampiresa -vampire lord=señor vampiro -You see a vampire lord. Be careful, he is after your blood!=Ves a un señor vampiro. Ten cuidado, ¡va tras tu sangre! From 517b62c5b1df8634eed955e81b4de8fa268340a0 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 00:18:53 -0800 Subject: [PATCH 077/162] Update Spanash locale file header --- data/languages/es.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/languages/es.txt b/data/languages/es.txt index e767074ca7..a739d264b5 100644 --- a/data/languages/es.txt +++ b/data/languages/es.txt @@ -1,7 +1,7 @@ ## -## Language: () -## Translators: [, ...] +## Language: Spanish (es) +## Translators: unknown ## From 1fd97009ebe893d568e701cc29cb0c4d2f716b4b Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 00:10:40 -0800 Subject: [PATCH 078/162] Update Spanish translations of item & entity descriptions --- data/languages/es.txt | 202 +++++++++++++++--------------------------- 1 file changed, 69 insertions(+), 133 deletions(-) diff --git a/data/languages/es.txt b/data/languages/es.txt index a739d264b5..4454b08101 100644 --- a/data/languages/es.txt +++ b/data/languages/es.txt @@ -1,7 +1,7 @@ ## ## Language: Spanish (es) -## Translators: unknown +## Translators: unknown, AntumDeluge ## @@ -61,7 +61,7 @@ magic plate armor=armadura de placas de acero mágica You see a suit of magic plate armor. The steel is well tempered and the suit is very strong.=Ves un traje de armadura de placas de acero mágica. El acero está bien templado y el traje es muy resistente. mainio armor=armadura de mainio -You see a strange suit of mainio armor. What it lacks in subtlety it makes up for with strength.= +You see a strange suit of mainio armor. What it lacks in subtlety it makes up for with strength.=Ves un extraño traje de armadura de mainio. Lo que le falta en sutileza lo suple con fortaleza. mithril armor=armadura de mithril You see a suit of mithril armor. Its tightly woven links are truly amazing.=Ves un traje de armadura de mithril. Sus eslabones apretadamente tejidos son verdaderamante asombrosos. @@ -70,7 +70,7 @@ pauldroned iron cuirass=coraza de hierro con hombreras You see a formidable pauldroned iron cuirass. The pauldrons (shoulder pieces) will protect your upper half.=Ves una formidable coraza de hierro con hombreras. Las hombreras (las piezas de los hombros) protegerán tu mitad superior. pauldroned leather cuirass=coraza de cuero con hombreras. -You see a pauldroned leather cuirass. It was crafted to withstand minor attacks.= +You see a pauldroned leather cuirass. It was crafted to withstand minor attacks.=Ves una coraza de cuero con hombreras. Fue diseñada para soportar ataques menores. plate armor=armadura de placas de acero You see a suit of plate armor. You imagine it would be heavy but the steel is well tempered and the suit is very strong.=Ves un traje de armadura de placas de acero. Te imaginas que será muy pesada pero el acero está bien templado y el traje es muy resistente. @@ -109,7 +109,7 @@ steel arrow=flecha de acero You see a shining steel arrow. With plenty of these, and a good bow, you'll be a formidable archer.=Ves una flecha de reluciente acero. Con muchas de éstas, y un buen arco, serás un arquero formidable. golden arrow=flecha de oro -You see a golden arrow. With a fist full of these and a good bow, you will surely take down your enemies quicker.= +You see a golden arrow. With a fist full of these and a good bow, you will surely take down your enemies quicker.=Ves una flecha de oro. Con un puñado de éstas y un buen arco, derribarás a tus enemigos más rápido. fire arrow= You see a fire arrow. The tip burns brightly.= @@ -124,7 +124,7 @@ dark arrow= You see a dark arrow. It's hard to describe.= power arrow=flecha de potencia -You see a power arrow. The sting of this arrow will surely defeat your enemies, when equipped with a bow.= +You see a power arrow. The sting of this arrow will surely defeat your enemies, when equipped with a bow.=Ves una flecha de potencia. La punzada de esta flecha seguramente derrotará a tus enemigos, cuando vaya equipada con un arco. ## axes @@ -151,7 +151,7 @@ durin axe=hacha de durin You see a durin axe, a great prize from the dwarves.=Ves un hacha de durin, un gran premio de los enanos. golden twoside axe=hacha de doble hoja de oro -You see a golden twoside axe. This axe is a rare find.= +You see a golden twoside axe. This axe is a rare find.=Ves un hacha de doble hoja de oro. Este hacha es un raro hallazgo. halberd=alabarda You see a rare halberd, with an axe's blade fused onto a shaft. It is both heavy and keen-edged.=Ves una rara alabarda, con una hoja de hacha enastada en un astil. Es a la vez pesada y de borde afilado. @@ -163,7 +163,7 @@ magic twoside axe=hacha de doble hoja mágica You see a magic twoside axe. The nature of the magic isn't clear to you.=Ves un hacha de doble hoja mágica. La naturaleza de la magia no está clara para ti. old scythe=guadaña vieja -You see an old scythe, it used to be a weapon of death. But now it is only a useful tool for farming.= +You see an old scythe, it used to be a weapon of death. But now it is only a useful tool for farming.=Ves una vieja guadaña, solía ser el arma de la muerte. Pero ahora sólo es una útil herramienta de labranza. scythe=guadaña You see the weapon of death - a scythe. It looks dangerous but perhaps also a useful tool for farming.=Ves el arma de la muerte - una guadaña. Parece peligrosa pero quizá también sea una herramienta útil para la labranza. @@ -240,7 +240,7 @@ steel boots=botas de acero You see a pair of steel boots, fit for any soldier.=Ves un par de botas de acero, adecuadas para cualquier soldado. stone boots=botas de piedra -You see a pair of stone boots. They may be heavy, but they protect your feet well.= +You see a pair of stone boots. They may be heavy, but they protect your feet well.=Ves un par de botas de piedra. Puede que sean pesadas, pero te protegen bien los pies. studded boots=botas tachonadas You see a pair of worn studded boots with moderate protection for your feet.=Ves un par de botas tachonadas desgastadas que proporcionan una protección moderada a tus pies. @@ -297,7 +297,7 @@ elvish cloak=capa élfica You see an elvish cloak. The material is dark, but thick and warm.=Ves una capa élfica. Su material es oscuro, pero es grueso y cálido. golden cloak=capa de oro -You see a golden cloak. See how the light glistens off the gold, it is a prized possession.= +You see a golden cloak. See how the light glistens off the gold, it is a prized possession.=Ves una capa de oro. Ves cómo la luz brilla saliendo del oro, es una preciada posesión. green dragon cloak=capa de dragón verde. You see a huge green dragon cloak. It's probably too big for you but, even dragging on the floor it will provide excellent protection.=Ves una enorme capa de dragón verde. Es probablemente demasiado grande para ti pero, aunque arrastre por el suelo te proporcionará una protección excelente. @@ -309,7 +309,7 @@ magic cloak= You see a magic cloak.= mainio cloak=capa de mainio -You see a mainio cloak. Its flashing colors are absurd! But you wear it because it's very well made.= +You see a mainio cloak. Its flashing colors are absurd! But you wear it because it's very well made.=Ves una capa de mainio ¡Sus colores parpadeantes son absurdos! Pero la llevas puesta porque está muy bien elaborada. mithril cloak=capa de mithril You see a mithril cloak. Its weave is so fine and its looks are breathtaking.=Ves una capa de mithril. Su trama es tan fina y su apariencia quita la respiración. @@ -333,7 +333,7 @@ vampire cloak=capa de vampiro You see a vibrant red vampire cloak. Wearing it sends a shiver down your spine.=Ves una capa de vampiro de vibrante color rojo. Llevarla puesta te produce un escalofrío por tu columna vertebral. xeno cloak=capa de xeno -You see a xeno cloak. It's heavy and thick, giving you good protection.= +You see a xeno cloak. It's heavy and thick, giving you good protection.=Ves una capa de xeno. Es pesada y gruesa, proporcionandote una buena protección. ## clubs @@ -351,7 +351,7 @@ enhanced mace=maza mejorada You see an enhanced mace. The heavy attacking end makes it hard to balance.=Ves una maza mejorada. Su pesado extremo de ataque la hace difícil de equilibrar. flail=mangual -You see a flail. Swinging it in circles will tire you but it will be an effective weapon.= +You see a flail. Swinging it in circles will tire you but it will be an effective weapon.=Ves un mangual. Moverlo en círculos te cansará pero será un arma efectiva. golden hammer=martillo de oro You see a valuable golden hammer. This golden weapon may be worth a lot to someone. It has a slow rate of attack.=Ves un valioso martillo de oro. Este arma de oro puede valer muchísimo para alguien. Tiene un ritmo de ataque lento. @@ -363,16 +363,16 @@ hammer=martillo You see a common hammer. It is heavy enough that you should be able to bludgeon your enemies with it, but only slowly=Ves un martillo común. Es bastante pesado por lo que deberías de ser capaz de aporrear a tus enemigos con él, pero sólo con lentitud. ice war hammer=martillo de guerra de hielo -You see an ice war hammer. The last owner must have been huge to wield it.= +You see an ice war hammer. The last owner must have been huge to wield it.=Ves un martillo de guerra de hielo. Su último dueño debe de haber sido enorme para manejarlo. mace=maza You see a mace, much neglected in years of use.=Ves una maza, muy descuidada en los años de uso. morning star=lucero del alba -You see a morning star. This is a very rare item indeed.= +You see a morning star. This is a very rare item indeed.=Ves un lucero del alba. Éste es realmente un artículo raro. rod of the gm=vara del DJ -You see a rod of the GM. This rod is reserved for those with special powers, be careful not to let it fall into the wrong hands.= +You see a rod of the GM. This rod is reserved for those with special powers, be careful not to let it fall into the wrong hands.=Ves una vara del DJ. Esta vara se reserva a aquellos con poderes especiales, ten cuidado de no dejar que caiga en las manos equivocadas. skull staff=bastón de calavera You see a rare skull staff. It appears mystical but will work like any other staff.=Ves un bastón de calavera. Parece místico pero funcionará como cualquier otro bastón. @@ -387,7 +387,7 @@ vulcano hammer=martillo de vulcano You see a vulcano hammer. It's said to be a weapon of a God, but attacks with a snail like pace.=Ves un martillo de vulcano. Se dice que es el arma de un dios, pero ataca al ritmo de un caracol. war hammer=martillo de guerra -You see a huge war hammer. It seems strong but is so heavy that you can only lift it to attack every so often.= +You see a huge war hammer. It seems strong but is so heavy that you can only lift it to attack every so often.=Ves un enorme martillo de guerra. Parece potente pero es tan pesado que sólo lo puedes levantar de vez en cuando para atacar. ## containers @@ -399,7 +399,7 @@ empty sack=saco vacío You see an empty sack. It will not stand up, unless you fill it first.=Ves un saco vacío. No se mantendrá en pie, a menos que lo llenes primero. flask=frasco -You see a flask. It's good for storing medicine.= +You see a flask. It's good for storing medicine.=Ves un frasco. Es bueno para almacenar medicina. eared bottle=botella con asas You see an eared bottle. It is empty, someone drank the contents.=Ves una botella con asas. Está vacía, alguien se bebió su contenido. @@ -411,10 +411,10 @@ fat bottle=botella gruesa You see a fat bottle. It is empty, someone drank the contents.=Ves una botella gruesa. Está vacía, alguien se bebió su contenido. empty goblet=copa vacía -You see an empty goblet. You wonder what could it hold.= +You see an empty goblet. You wonder what could it hold.=Ves una copa vacía. Te preguntas que podría contener. goblet=copa -You see a goblet. You look at its contents, and shiver at the blood inside.= +You see a goblet. You look at its contents, and shiver at the blood inside.=Ves una copa. Miras su contenido, y sientes escalofríos al ver sangre dentro. vial= You see a vial used in chemestry.= @@ -494,7 +494,7 @@ water=agua You see a bottle of fresh spring water. It's really tasty and fresh.=Ves una botella de agua fresca de manantial. Es realmente sabrosa y fresca. pina colada=piña colada -You see a pina colada. It looks delicious but tastes dangerously strong!= +You see a pina colada. It looks delicious but tastes dangerously strong!=Ves una piña colada. ¡Parece deliciosa pero sabe peligrosamente fuerte! tea=té You see a lovely cup of tea.=Ves una encantadora taza de té. @@ -521,7 +521,7 @@ deadly poison=veneno mortal You see a deadly poison. Don't drink it!=Ves un veneno mortal ¡No te lo tomes! disease poison=veneno de enfermar -You see a disease poison. Be careful, it's wicked.= +You see a disease poison. Be careful, it's wicked.=Ves un veneno de enfermar. Ten cuidado, es malvado. mega poison=mega veneno You see a mega poison. This is some wicked poison.=Ves un mega veneno. Éste es un veneno malvado. @@ -632,13 +632,13 @@ watermelon= You see a watermelon. It refreshes your throat during hot summer days.= artichoke=alcachofa -You see an artichoke. It can be an ingredient, or you can eat it.= +You see an artichoke. It can be an ingredient, or you can eat it.=Ves una alcachofa. Puede ser un ingrediente, o te la puedes comer. broccoli=brocoli You see a bunch of broccoli.=Ves un manojo de brocoli. carrot=zanahoria -You see a carrot. It can be an ingredient, or you can eat it.= +You see a carrot. It can be an ingredient, or you can eat it.=Ves una zanahoria. Puede ser un ingrediente, o te la puedes comer. cauliflower=coliflor You see a fresh head of cauliflower.=Ves la cabeza de una fresca coliflor. @@ -670,10 +670,10 @@ egg=huevo You see an egg.=Ves un huevo. button mushroom=champiñón común -You see a button mushroom. It can be an ingredient, or you can eat it.= +You see a button mushroom. It can be an ingredient, or you can eat it.=Ves un champiñón común. Puede ser un ingrediente, o te lo puedes comer. porcini=seta calabaza -You see a porcini. It can be an ingredient, or you can eat it.= +You see a porcini. It can be an ingredient, or you can eat it.=Ves una seta calabaza. Puede ser un ingrediente, o te la puedes comer. toadstool=seta venenosa You see a toadstool. Beware!=Ves una seta venenosa ¡Ten cuidado! @@ -712,7 +712,7 @@ smoked trout= You see a smoked trout.= bread=pan -You see a loaf of bread. It is freshly baked and ready to eat.= +You see a loaf of bread. It is freshly baked and ready to eat.=Ves una barra de pan. Está recién horneada y lista para comer. pie=pastel You see a meat and vegetable pie.=Ves un pastel de carne y verduras. @@ -745,7 +745,7 @@ honey=miel You see a jar of sticky sweet honey. It's the clear runny kind.=Ves una jarra de miel dulce y pegajosa. Es de tipo fluído y claro. icecream=helado -You see a wafer cone with vanilla ice cream and chocolate flakes.= +You see a wafer cone with vanilla ice cream and chocolate flakes.=Ves un cucurucho de helado de vainilla y virutas de chocolate. licorice=regaliz You see some delicious licorice. Your mouth waters.=Ves un poco de delicioso regaliz. Se te hace la boca agua. @@ -763,7 +763,7 @@ sausage=salchicha You see what looks like a tasty sausage.=Ves lo que parece ser una sabrosa salchicha. tuna sandwich=sandwich de atún -You see what looks like a tuna sandwich.= +You see what looks like a tuna sandwich.=Ves lo que parece ser un sandwich de atún. chocolate shake=batido de chocolate You see a scrumptious chocolate shake. Absolutely NO calories.=Ves un batido de chocolate para chuparse los dedos. Absolutamente SIN calorías. @@ -781,7 +781,7 @@ pinto beans= You see a bunch of pinto beans. An ingredient a chef will surely appreciate...= cheese=queso -You see some cheese. Eat it and see what happens.= +You see some cheese. Eat it and see what happens.=Ves un poco de queso. Cometelo y verás lo que pasa. chicken=pollo You see a tasty leg of chicken.=Ves un sabroso muslo de pollo. @@ -865,7 +865,7 @@ viking helmet=casco de vikingo You see a viking helmet. The previous owner wore it to many battles.=Ves un casco de vikingo. Su anterior dueño lo llevó consigo a muchas batallas. aventail=almófar -You see an aventail. It's a clever design.= +You see an aventail. It's a clever design.=Ves un almófar. Es un diseño ingenioso. blue helmet=casco azul You see a brand new blue helmet.=Ves un casco azul nuevecito. @@ -910,7 +910,7 @@ You see a royal helmet.= ## herbs arandula=arandula -You see an arandula. It has medicinal properties, if the right person uses it.= +You see an arandula. It has medicinal properties, if the right person uses it.=Ves una arandula. Tiene propiedades medicinales, si es usada por la persona adecuada. kokuda=kokuda You see a kokuda. It has medicinal properties, if the right person uses it.=Ves una kokuda. Tiene propiedades medicinales, si es usada por la persona adecuada. @@ -946,7 +946,7 @@ amethyst= You see an amethyst, a precious gemstone.= diamond=diamante -You see a diamond, not just a beautiful gem but also the hardest naturally occurring material.= +You see a diamond, not just a beautiful gem but also the hardest naturally occurring material.=Ves un diamante, no es sólo una hermosa gema sino también el material más duro de origen natural. black pearl=perla negra You see a black pearl, so dark and shiny.=Ves una perla negra, tan oscura y brillante. @@ -961,7 +961,7 @@ lich gold key=llave de oro del lich You see a golden lich key. It will open the door to terrible things.=Ves una llave de oro del lick. Abrirá la puerta a cosas terribles. minotaur key=llave del minotauro -You see a fancy bronze key. It smells faintly of minotaur. Perhaps one dropped it?= +You see a fancy bronze key. It smells faintly of minotaur. Perhaps one dropped it?=Ves una lujosa llave de bronce. Huele ligeramente a minotauro. ¿Quizá se le cayó a uno? nalwor bank key=llave del banco de nalwor You see a key to the customer room of Nalwor Bank.=Ves una llave de la sala de clientes del Banco de Nalwork. @@ -1022,7 +1022,7 @@ You see a pair of leather legs. They look new but they're poor quality.=Ves un p magic plate legs= mainio legs=quijotes de mainio -You see a pair of odd looking mainio legs. They are somewhat startling but they give you good protection.= +You see a pair of odd looking mainio legs. They are somewhat startling but they give you good protection.=Ves un par de quijotes de mainio de extraño aspecto. Son de algún modo sorprendentes pero te proporcionan una buena proteccion. mithril legs=quijotes de mithril You see a pair of mithril legs. They will serve you well.=Ves un par de quijotes de mithril. Te servirán de mucho. @@ -1040,7 +1040,7 @@ stone legs= You see a pair of stone legs, heavy and durable.= studded legs=quijotes tachonados -You see a pair of blood stained studded legs. You're not sure if the blood came from their last owner... or his enemies.= +You see a pair of blood stained studded legs. You're not sure if the blood came from their last owner... or his enemies.=Ves un par de quijotes tachonados manchados de sangre. No estás seguro de si la sangre es de su último dueño... o de sus enemigos. xeno legs=quijotes de xeno You see a pair of xeno legs. They're very strong and look brand new.=Ves un par de quijotes de xeno. Son muy resistentes y parecen nuevecitos. @@ -1052,10 +1052,10 @@ decent meal= You see a decent meal for Groongo Rahnnt. Deliver it to him quickly!= bulb=bulbo -You see a bulb. It can be planted in fertile ground where it will thrive.= +You see a bulb. It can be planted in fertile ground where it will thrive.=Ves un bulbo. Puede ser plantado en terreno fértil donde se prosperará. seed=semilla -You see a seed. It can be planted in fertile ground where it will thrive.= +You see a seed. It can be planted in fertile ground where it will thrive.=Ves un semilla. Puede ser plantado en terreno fértil donde se prosperará. giant heart=corazón gigante You see a giant heart. This proves that a giant was defeated, and has magical properties that you are not sure of.=Ves un corazón gigante. Ésto demuestra que un gigante fue derrotado, y tiene propiedades mágicas de las que no estás seguro. @@ -1064,16 +1064,16 @@ dice=dados You see a set of dice. May lady luck be with you.=Ves un grupo de dados. Que la suerte te acompañe. cards=cartas -You see a deck of cards. Shuffle them well, to get a winning hand.= +You see a deck of cards. Shuffle them well, to get a winning hand.=Ves una baraja de cartas. Barajealas bien, para ganar la mano. teddy=peluche -You see a teddy bear. It's soft and cuddly, and children love them.= +You see a teddy bear. It's soft and cuddly, and children love them.=Ves un oso de peluche. Es suave y tierno, y a los niños les encanta. rodent trap= You see a rodent trap.= vampirette entrails=entrañas de vampiresa -You see some vampirette entrails. These guts prove that a vampirette was slain.= +You see some vampirette entrails. These guts prove that a vampirette was slain.=Ves unas entrañas de vampiresa. Estas vísceras demuestran que una vampiresa fue asesinada. bat entrails=entrañas de murciégalo You see some bat entrails, full of the blood of a living creature.=Ves unas entrañas de murciégalo, llenas de sangre de algún ser vivo. @@ -1085,10 +1085,10 @@ marbles=canicas You see some marbles. Boys will be boys.=Ves unas canicas. Son cosas de niños. canned tuna=atún en lata -You see what appears to be canned tuna. Too bad you don't have a can opener.= +You see what appears to be canned tuna. Too bad you don't have a can opener.=Ves lo que parece ser atún enlatado. Lástima que no tengas un abrelatas. snowglobe=esfera de nieve -You see a snowglobe. It's so festive, it reminds you of Christmas!= +You see a snowglobe. It's so festive, it reminds you of Christmas!=Ves una esfera de nieve. ¡Es tan festiva, te recuerda a la Navidad! bobbin=canilla You see a bobbin for a sewing machine.=Ves una canilla para una máquina de coser. @@ -1109,7 +1109,7 @@ You see a spiral unicorn horn. It is highly valued by traders and used in the cr ## missiles snowball=bola de nieve -You see a snowball. You can throw it at your friends or put it in your bag to keep your fish fresh. But be careful, there could be little stones in it.= +You see a snowball. You can throw it at your friends or put it in your bag to keep your fish fresh. But be careful, there could be little stones in it.=Ves una bola de nieve. Puedes tirarselas a tus amigos o ponerlas en tu bolsa para conservar el pescado fresco. Pero ten cuidado, podría haber piedrecitas dentro de ella. vomit=vómito You see a pile of vomit. Gross!=Ves un montón de vómito ¡Qué desagradable! @@ -1141,7 +1141,7 @@ composite bow=arco compuesto You see a composite bow. It's better strung than most bows, for excellent ranged attack.=Ves un arco compuesto. Está mejor tensado que la mayoría de arcos, para proporcionar un excelente ataque a distancia. crossbow=ballesta -You see a crossbow. The attack is high but it has a very short range. What do you prefer?= +You see a crossbow. The attack is high but it has a very short range. What do you prefer?=Ves una ballesta. Su ataque es elevado pero cubre una distancia muy corta. ¿Qué prefieres? hunter crossbow=ballesta de cazador You see a hunter crossbow. You must decide if the high attack is worth the short range it has.=Ves una ballesta de cazador. Debes decidir si su elevado ataque compensa la corta distancia que cubre. @@ -1210,7 +1210,7 @@ silk gland=glándula de seda You see a silk gland from a giant spider. Its contents are extremely valuable.=Ves una glándula de seda de una araña gigante. Su contenido es extremadamente valioso. silk thread=hilo de seda -You see a spool of silk thread, spun from the glands of a giant spider.= +You see a spool of silk thread, spun from the glands of a giant spider.=Ves un carrete de hilo de seda, hilado de las glándulas de una araña gigante. oil=aceite You see a small can of oil.=Ves una pequeña lata de aceite. @@ -1286,7 +1286,7 @@ nalwor city scroll=pergamino de la ciudad de nalwor You see a nalwor city scroll, it will take you back to nalwor city.=Ves un pergamino de la ciudad de nalwor, te llevará de regreso a la ciudad de nalwor. ados city scroll=pergamino de la ciudad de ados -You see an ados city scroll, it will take you back to ados city.= +You see an ados city scroll, it will take you back to ados city.=Ves un pergamino de la ciudad de ados, te llevará de regreso a la ciudad de ados. fado city scroll=pergamino de la ciudad de fado You see a fado city scroll, it will take you back to fado city.=Ves un pergamino de la ciudad de fado, te llevará de regreso a la ciudad de fado. @@ -1344,13 +1344,13 @@ golden shield=escudo de oro You see a golden shield, could it be the ultimate in defense?=Ves un escudo de oro, ¿podría ser lo último en defensa? green dragon shield=escudo de dragón verde -You see a green dragon shield, scaly and strong.= +You see a green dragon shield, scaly and strong.=Ves un escudo de dragón verde, escamoso y resistente. lion shield=escudo de león You see a valuable lion shield. It is heavy enough to defend you against strong attacks.=Ves un valioso escudo de león. Es lo bastante pesado como para defenderte frente a ataques potentes. magic plate shield=escudo mágico de placas de acero -You see a magic plate shield. It has a magical quality surrounding it.= +You see a magic plate shield. It has a magical quality surrounding it.=Ves un escudo mágico de placas de acero. Tiene una cualidad mágica que lo envuelve. mainio shield=escudo de mainio You see a strange looking mainio shield. You have no idea what it's made of, but it seems to protect you well by distracting your enemies.=Ves un escudo de mainio de extraña apariencia. No tienes ni idea de lo que está hecho, pero parece que te protege bien al distraer a tus enemigos. @@ -1397,7 +1397,7 @@ mithril clasp=cierre de mithril You see a clasp made from mithril, it would provide the fastening for a cloak.=Ves un cierre elaborado a partir de mithril, te proporcionaría la fijación para una capa. mythical egg=huevo mítico -You see a mythical egg, but you do not know what it is for.= +You see a mythical egg, but you do not know what it is for.=Ves un huevo mítico, pero no sabes para qué es. magical eggshells=cáscaras de huevo mágicas You see shards from a mythical egg. They have magical properties.=Ves fragmentos de un huevo mítico. Tienen propiedades mágicas. @@ -1421,10 +1421,10 @@ assassin dagger=daga de asesino You see an assassin dagger, easy to pull out and use when needed.=Ves una daga de asesino, fácil de sacar y de usar cuando se necesite. biting sword=espada mordaz -The tip of this biting sword is chiseled to a lethal point. It will serve you well.= +The tip of this biting sword is chiseled to a lethal point. It will serve you well.=La punta de esta espada mordaz está cincelada hasta un punto letal. black sword=espada negra -You see a black sword. Its darkness will surely protect you.= +You see a black sword. Its darkness will surely protect you.=Ves una espada negra. Su oscuridad seguro que te protegerá. broadsword=espada ancha You see a mighty broadsword. Enemies will see their death.=Ves una poderosa espada ancha. Los enemigos verán su muerte. @@ -1436,7 +1436,7 @@ chaos dagger=daga del caos You see a chaos dagger, it is very lightweight and sharp. It will heal you while hurting them.=Ves una daga del caos, es muy ligera y afilada. chaos sword=espada del caos -You see a chaos sword. Wielding it allows to hurt your foes and to heal you at the same time.= +You see a chaos sword. Wielding it allows to hurt your foes and to heal you at the same time.=Ves una espada del caos. Empuñarla te permite hacer daño a tus enemigos y curarte al mismo tiempo. claymore=claymore This claymore is very hard to lift as it is so heavy. It will be a good weapon if you can swing it.=Esta claymore es muy difícil de levantar ya que es muy pesada. @@ -1457,7 +1457,7 @@ drow sword=espada drow This is a genuine drow sword.=Esta es una genuina espada drow. elvish sword=espada élfica -This is an elvish sword. It is finely crafted.= +This is an elvish sword. It is finely crafted.=Esta es una espada élfica. Está finamente elaborada. fire sword=espada de fuego Flames race along this fire sword as you wield it.=Las llamas corren a lo largo de esta espada de fuego mientras la esgrimes. @@ -1499,7 +1499,7 @@ nihonto=nihonto You see a samurai's nihonto sword with a razor sharp blade.=Ves una espada nihonto de samurai con una hoja tan afilada como la de una cuchilla. obsidian knife=cuchillo de obsidiana -You see a knife whose blade is crafted to a lethal edge from the finest obsidian.= +You see a knife whose blade is crafted to a lethal edge from the finest obsidian.=Ves un cuchillo cuya hoja se ha trabajado hasta conseguir un filo letal a partir de la obsidiana más pura. orc sword=espada de orco You see an orc sword which has a heavy and deadly appearance.=Ves una espada de orco que tiene una apariencia pesada y mortal. @@ -1577,7 +1577,7 @@ magical needle=aguja mágica You see a magical needle with a very sharp point.=Ves una aguja mágica con una punta muy afilada. pick=pico -You see a pick. It is a tool for excavating coal.= +You see a pick. It is a tool for excavating coal.=Ves un pico. Es una herramienta para la extracción de carbón. shovel= You see a shovel, a tool for digging.= @@ -1609,7 +1609,7 @@ dark angel=ángel oscuro You see a dark angel. He is an strong evil angel, and for now he is under cover of darkness.=Ves a un ángel oscuro. Es un ángel poderoso y malvado, y por ahora está al amparo de la oscuridad. dark archangel=arcángel oscuro -You see a dark archangel. After she fell from heaven her soul became as dark as she is now.= +You see a dark archangel. After she fell from heaven her soul became as dark as she is now.=Ves a una arcángel oscura. Después de que cayese del cielo su alma se volvió tan oscura como ella lo es ahora. fallen angel=ángel caído You see a fallen angel. When he turned away from good, he fell down from heaven.=Ves a un ángel caído. Cuando se apartó del bien, se cayó del cielo. @@ -1731,7 +1731,7 @@ chick=pollito You see a little chick, it doesn't like to be away from its mother.=Ves un pequeño pollito, no le gusta estar lejos de su madre. chicken=pollo -You see a chicken, isn't it nice?= +You see a chicken, isn't it nice?=Ves un pollo, ¿a que es bonito? dodo= You see a dodo bird, aren't they supposed to be extinct?= @@ -1752,7 +1752,7 @@ young beholder=joven beholder You see a young beholder. His huge eye will find you everywhere!=Ves un joven beholder ¡Su ojo gigante te encontrará en cualquier lugar! beholder=beholder -You see a beholder which can see you very well with his huge eye...= +You see a beholder which can see you very well with his huge eye...=Ves un beholder que puede verte muy bien con su enorme ojo... elder beholder=beholder anciano You see an elder beholder, his nasty eye will scare you.=Ves un beholder anciano, su desagradable ojo te asustará. @@ -2126,7 +2126,7 @@ ice golem=golem de hielo You see an Ice golem. Ice Golems are elementals made out of ice. You should watch out for its icy fists or you might get hurt.= stone golem=golem de piedra -You see a stone golem, it only exists to protect. What was it crafted for to protect, and what would one do if it lost its purpose?= +You see a stone golem, it only exists to protect. What was it crafted for to protect, and what would one do if it lost its purpose?=Ves a un golem de piedra, existe solamente para proteger. ¿Qué fue diseñado para proteger, y qué haría si perdiese su propósito? wooden golem=golem de madera You see a wooden golem. The scroll with ancient words in his head keeps it walking.=Ves a un golem de madera. El pergamino con las antiguas palabras en su cabeza lo mantiene caminando. @@ -2135,7 +2135,7 @@ You see a wooden golem. The scroll with ancient words in his head keeps it walki ## human kalavan housewife=ama de casa kalavan -You see a kalavan housewife. She lives in Kalavan city and she is very angry with rude people who want to steal her food out of the kitchen and destroy her beautiful flower garden!= +You see a kalavan housewife. She lives in Kalavan city and she is very angry with rude people who want to steal her food out of the kitchen and destroy her beautiful flower garden!=Ves a una ama de casa kalavan. Vive en la ciudad de Kalavan y ¡se enfada mucho con la gente ruda que quiere robar comida de su cocina y destruir su precioso jardín! kalavan peasant=campesino kalavan You see a kalavan peasant. He works in the fields around Kalavan city. As he heard there were strangers in the city he came to help the kalavan citizens in fighting the enemies!=Ves un campesino kalavan. Trabaja en los campos de alrededor de la ciudad de Kalavan. Cuando oyó que había extranjeros en la ciudad vino a ayudar a los ciudadanos de kalavan a luchar contra los enemigos! @@ -2156,7 +2156,7 @@ devil monk=monje del diablo You see a devil monk. He is a member of a devil cult which practises black rituals.=Ves a un monje del diablo. Es miembro de un culto al diablo que practica negros rituales. littlewitch=brujita -You see a little witch. These little girls are witches and that makes them very dangerous.= +You see a little witch. These little girls are witches and that makes them very dangerous.=Ves a una brujita. Estas niñitas son brujas y eso las hace muy peligrosas. littlewizard=pequeño mago You see a little wizard. Although he is a child, he is already able to cast powerful spells.=Ves a un pequeño mago. Aunque es un crío, ya es capaz de lanzar poderosos hechizos. @@ -2304,7 +2304,7 @@ chaos lord=señor del caos You see a chaos lord who is one of the strongest chaos creatures in Faiumoni. You should prepare well before attacking him.= chaos overlord=gran señor del caos -You see a chaos overlord. It is him who directs the creation of evil plans and gives orders to all chaotic creatures which exist.= +You see a chaos overlord. It is him who directs the creation of evil plans and gives orders to all chaotic creatures which exist.=Ves a un gran señor del caos. Es él quien dirige la creación de los planes malvados y da las órdenes a todas las criaturas que existen. ## human_imperial @@ -2516,7 +2516,7 @@ leader kobold=líder kobold You see a leader kobold, one of the mighty warriors.=Ves a un líder kobold, uno de los poderosos guerreros. giant kobold=kobold gigante -You see a giant kobold. Though generally playful it doesn't quite know its own strength. When it asks for a hug, it's best to decline that offer.= +You see a giant kobold. Though generally playful it doesn't quite know its own strength. When it asks for a hug, it's best to decline that offer.=Ves a un kobold gigante. Aunque por lo general es juguetón no conoce su propia fuerza. Cuando pide un abrazo, es mejor rechazar la oferta. ## mutant @@ -2579,7 +2579,7 @@ ivory pegasus= ebony pegasus= centaur=centauro -You see a noble centaur, half man, half horse. He looks capable of great damage but thankfully seems to mean you no harm.= +You see a noble centaur, half man, half horse. He looks capable of great damage but thankfully seems to mean you no harm.=Ves a un noble centauro, mitad hombre, mitad caballo. Parece capaz de causar gran daño pero afortunadamente no parece tener intención de herirte. solar centaur= @@ -2818,7 +2818,7 @@ death=muerte You see Death. Do you have the will to stare him in the face? Today he's not in the mood to bargain with your soul.=Ves a la Muerte ¿Tendrás el valor de mirarla a la cara? Hoy no está de humor para negociar con tu alma. black death=muerte negra -You see a black death. With his scythe he reaps your soul and then he takes it over the river where it has to stay until judgement day arrives.= +You see a black death. With his scythe he reaps your soul and then he takes it over the river where it has to stay until judgement day arrives.=Ves una muerte negra. Con su guadaña siega tu alma y después se la lleva al río donde tiene que permanecer hasta que llegue el día del juicio. golden death=muerte de oro You see the golden death. He came to take your soul away to pay for all your sins.=Ves a la muerte de oro. Vino a llevarse tu alma para que pague por todos tus pecados. @@ -2845,7 +2845,7 @@ You see a vampire lord. Be careful, he is after your blood!=Ves a un señor vamp ## undead_zombie bloody zombie=zombi sangriento -You see a bloody zombie. Can you see the drops of blood which fall from his body?= +You see a bloody zombie. Can you see the drops of blood which fall from his body?=Ves a un zombi sangriento. ¿Puedes ver las gotas de sangre que caen de su cuerpo? zombie=zombi You see a zombie. It woke up just to take revenge, be silent.=Ves a un zombi. Se despertó solo para vengarse, estate en silencio. @@ -2859,26 +2859,10 @@ You see a rotten zombie. You are disgusted as you see its rotten skin that hangs # strings not found in template -You see a pauldroned leather cuirass. It was crafted to withstand minor attacks.=Ves una coraza de cuero con hombreras. Fue diseñada para soportar ataques menores. -You see a strange strange suit of mainio armor. What it lacks in subtlety it makes up for with strength.=Ves un extraño traje de armadura de mainio. Lo que le falta en sutileza lo suple con fortaleza. -You see a golden arrow. With a fist full of these and a good bow, you will surely take down your enemies quicker.=Ves una flecha de oro. Con un puñado de éstas y un buen arco, derribarás a tus enemigos más rápido. -You see a power arrow. The sting of this arrow will surely defeat your enemies, when equipped with a bow.=Ves una flecha de potencia. La punzada de esta flecha seguramente derrotará a tus enemigos, cuando vaya equipada con un arco. -You see an old scythe, it used to be weapon of death. But now it is only a useful tool for farming.=Ves una vieja guadaña, solía ser el arma de la muerte. Pero ahora sólo es una útil herramienta de labranza. -You see a golden twoside axe. This axe is a rare find.=Ves un hacha de doble hoja de oro. Este hacha es un raro hallazgo. -You see a pair of stone boots. They may be heavy, but they protect your feet well.=Ves un par de botas de piedra. Puede que sean pesadas, pero te protegen bien los pies. -You see a golden cloak. See how the light glistens off the gold, it is a prized possession.=Ves una capa de oro. Ves cómo la luz brilla saliendo del oro, es una preciada posesión. -You see a mainio cloak. It's flashing colors are absurd! But you wear it because it's very well made.=Ves una capa de mainio ¡Sus colores parpadeantes son absurdos! Pero la llevas puesta porque está muy bien elaborada. -You see a xeno cloak. It's heavy and thick, giving you a good protection.=Ves una capa de xeno. Es pesada y gruesa, proporcionandote una buena protección. rift cloak=capa de rift You see a rift cloak. Almost useless in the battle, but saves your life when you enter a magical rift.=Ves una capa de rift. Casi inútil en la batalla, pero te salva la vida cuando entras en un rift mágico. -You see a military flail. Swinging it in circles will tire you but it will be an effective weapon.=Ves un mangual militar. Moverlo en círculos te cansará pero será un arma efectiva. -You see a morning star. This is a very rare item indeed.=Ves un lucero del alba. Éste es realmente un artículo raro. -You see a huge war hammer. It seems strong but is so heavy that you can only lift it to attack every so often..=Ves un enorme martillo de guerra. Parece potente pero es tan pesado que sólo lo puedes levantar de vez en cuando para atacar.. -You see a ice war hammer. The last owner must have been huge, to wield it.=Ves un martillo de guerra de hielo. Su último dueño debe de haber sido enorme, para manejarlo. necromancers staff=baston de nigromante You see a cunningly beautiful staff. If you listen carefully you can hear its previous owners' souls screaming from within it.=Ves un bastón engañosamente hermoso. Si escuchas atentamente puedes oir las almas de sus anteriores dueños gritar desde dentro. -You see a rod of the GM. This rod is reserved for those with special powers, be careful not to let it fall into the wrong hands.=Ves una vara del DJ. Esta vara se reserva a aquellos con poderes especiales, ten cuidado de no dejar que caiga en las manos equivocadas. -You see a flask. This flask is good for storing medicine.=Ves un frasco. Este frasco es bueno para almacenar medicina. bottle=botella You see a bottle. It is empty, someone drank the contents.=Ves una botella. Está vacía, alguien se bebió su contenido. big bottle=botella grande @@ -2893,30 +2877,14 @@ tall bottle=botella alta. You see a tall bottle. It is empty, someone drank the contents.=Ves una botella alta. Está vacía, alguien se bebió su contenido. triangular bottle=botella triangular You see a triangular bottle. It is empty, someone drank the contents.=Ves una botella triangular. Está vacía, alguien se bebió su contenido. -You see an empty goblet. You wonder what could it hold.=Ves una copa vacía. Te preguntas que podría contener. -You see a goblet. You look at its contents, and shiver at the blood inside.=Ves una copa. Miras su contenido, y sientes escalofríos al ver sangre dentro. blank scroll=pergamino en blanco You see a rolled up blank scroll.=Ves un pergamino enrollado y en blanco ice scroll=pergamino de hielo You see a scroll, circled by ice crystals. You can feel its cold aura.=Ves un pergamino, rodeado por cristales de hielo. Puedes sentir su fría aura. -You see a pina colada. It looks delicious but tastes dangerously strong!.=Ves una piña colada ¡Parece deliciosa pero sabe peligrosamente fuerte! -You see a disease poison. Be careful, it's wicked.=Ves un veneno de enfermar. Ten cuidado, es malvado. -You see some cheese. Eat it and see what happens.=Ves un poco de queso. Cometelo y verás lo que pasa. -You see a wafer cone with vanilla ice cream and a chocolate flake.=Ves un cucurucho de helado de vainilla y virutas de chocolate. -You see an artichoke. It can be an ingredient, or you can eat it.=Ves una alcachofa. Puede ser un ingrediente, o te la puedes comer. -You see a carrot. It can be an ingredient, or you can eat it.=Ves una zanahoria. Puede ser un ingrediente, o te la puedes comer. salad=ensalada You see a salad.=Ves una ensalada. -You see a loaf of bread. It is freshly baked and ready to eat.=Ves una barra de pan. Está recién horneada y lista para comer. -You see a button mushroom. It can be an ingredient, or you can eat it.=Ves un champiñón común. Puede ser un ingrediente, o te lo puedes comer. -You see a porcini. It can be an ingredient, or you can eat it.=Ves una seta calabaza. Puede ser un ingrediente, o te la puedes comer. courgette=calabacín You see a courgette. It can be an ingredient, or you can eat it.=Ves un calabacín. Puede ser un ingrediente, o te lo puedes comer. -You see what looks like tuna sandwich.=Ves lo que parece ser un sandwich de atún. -You see a aventail. It's a clever design.=Ves un almófar. Es un diseño ingenioso. -You see a arandula. It has medicinal properties, if the right person uses it.=Ves una arandula. Tiene propiedades medicinales, si es usada por la persona adecuada. -You see a diamond, not just a beautiful gem but also the hardest naturally occurring material .=Ves un diamante, no es sólo una hermosa gema sino también el material más duro de origen natural. -You see a fancy bronze key. It smells faintly of minotaur, perhaps one dropped it?=Ves una lujosa llave de bronce. Huele ligeramente a minotauro, ¿quizá se le cayó a uno? fado hotel key 001=llave 001 del hotel de fado You see a key to room #001 in the Fado Hotel.=Ves una llave de la habitación #001 del hotel de Fado. fado hotel key 002=llave 002 del hotel de fado @@ -2933,21 +2901,10 @@ fado hotel key 007=llave 007 del hotel de fado You see a key to room #007 in the Fado Hotel.=Ves una llave de la habitación #007 del hotel de Fado. fado hotel key 008=llave 008 del hotel de fado You see a key to room #008 in the Fado Hotel.=Ves una llave de la habitación #008 del hotel de Fado. -You see a pair of blood stained studded legs. You're not sure if the blood came from their last owner ... or his enemies.=Ves un par de quijotes tachonados manchados de sangre. No estás seguro de si la sangre es de su último dueño ... o de sus enemigos. -You see a pair of odd looking mainio legs. They are somewhat startling but they give you a good protection.=Ves un par de quijotes de mainio de extraño aspecto. Son de algún modo sorprendentes pero te proporcionan una buena proteccion. -You see a bulb. It can be planted anywhere, but it will only thrive on fertile ground.=Ves un bulbo. Puede ser plantado en cualquier sitio, pero sólo prosperará en un terreno fértil. -You see a seed. It can be planted anywhere, but it will only thrive on fertile ground.=Ves una semilla. Puede ser plantada en cualquier sitio, pero sólo prosperará en un terreno fértil. -You see a deck of cards. Shuffle them well, to get a winning hand.=Ves una baraja de cartas. Barajealas bien, para ganar la mano. -You see a teddy bear. Its soft and cuddly, and children love them.=Ves un oso de peluche. Es suave y tierno, y a los niños les encanta. -You see some vampirette entrails. These guts proves that a vampirette was slain.=Ves unas entrañas de vampiresa. Estas vísceras demuestran que una vampiresa fue asesinada. -You see tuna in a can. Too bad you don't have a can opener.=Ves atún en una lata. Lástima que no tengas un abrelatas. -You see a snowglobe. You are SUCH a tourist!=Ves una esfera de nieve ¡Estás hecho un turista! -You see snowballs. You can throw them at your friends or put it in your bag to keep your fish fresh. But be careful, there could be little stones in it.=Ves bolas de nieve. Puedes tirarselas a tus amigos o ponerlas en tu bolsa para conservar el pescado fresco. Pero ten cuidado, podría haber piedrecitas dentro de ella. dart=dardo You see a dart. You'll need to be close before you can use it as a missile. Stand square on, not diagonally, for the best results.=Ves un dardo. Necesitarás estar cerca antes de que lo puedas usar como proyectil. Permanece recto, no inclinado, para obtener los mejores resultados. power dart=dardo de potencia You see a power dart. You'll need to be close before you can use it as a missile. Stand square on, not diagonally, for the best results.=Ves un dardo de potencia. Necesitarás estar cerca antes de que lo puedas usar como proyectil. Permanece recto, no inclinado, para obtener los mejores resultados. -You see a crossbow. The attack is high but it has a very short range, what do you prefer?=Ves una ballesta. Su ataque es elevado pero cubre una distancia muy corta, ¿qué prefieres? angel figurine=figurilla de ángel You see a sparkling angel figurine.=Ves una figurilla de ángel resplandeciente. ankh=anj @@ -2955,19 +2912,10 @@ You see a mysterious ankh. You don't know what it is for.=Ves un misterioso anj. iron=hierro reptile egg=huevo de reptil You see a valuable reptile egg.=Ves un valioso huevo de reptil. -You see a spool of silk thread, spun from the glands of a giant spider..=Ves un carrete de hilo de seda, hilado de las glándulas de una araña gigante.. -You see a ados city scroll, it will take you back to ados city.=Ves un pergamino de la ciudad de ados, te llevará de regreso a la ciudad de ados. -You see an green dragon shield, scaly and strong.=Ves un escudo de dragón verde, escamoso y resistente. -You see a magic plate shield. Its has a magical quality surrounding it.=Ves un escudo mágico de placas de acero. Tiene una cualidad mágica que lo envuelve. -You see a mythical egg, but you do not know, what it is for.=Ves un huevo mítico, pero no sabes, para qué es. -You see a knife whose blade is crafted to a lethal edge from finest obsidian.=Ves un cuchillo cuya hoja se ha trabajado hasta conseguir un filo letal a partir de la obsidiana más pura. -The point of this biting sword is chiseled to a lethal point. It will serve you well.=La punta de esta espada mordaz está cincelada hasta un punto letal. -The chaos sword. It hurts them but it heals you.=La espada del caos. Les hace daño a ellos pero a ti te cura. -This an elvish sword. It looks like it is made from tree leaves!=Esta es una espada élfica ¡Parece que está hecha de hojas de árbol! -You see a black sword. Its darkness will surely protect you.=Ves una espada negra. Su oscuridad seguro que te protegerá. -You see a pick. It is a tool which helps you to get some coal.=Ves un pico. Es una herramienta que te ayuda a obtener algo de carbón. + +# creature speach not yet supported by parser + click-clack-click=clic-clac-clic -You see a chicken, isn't it nice?.=Ves un pollo, ¿a que es bonito? cluck cluck cluck=cloc cloc cloc cluck cluck=cloc cloc Oou! Oou!=Oou! Oou! @@ -2986,15 +2934,12 @@ WHOOOOEOEOEZZZZZZ!!!=WHOOOOEOEOEZZZZZZ!!! Miiiiaaauuu!=Miiiiaaauuu! ROOOOAAAAR!=ROOOOAAAAR! Defend yourself! I can see you!=¡Defiendete! ¡Puedo verte! -You see a beholder which can see you very well with its huge eye...=Ves un beholder que puede verte muy bien con su enorme ojo... Defy order! Seek chaos!=¡Desafía al orden! ¡Busca el caos! Chaos in the wrath!=¡El caos en la ira! I will summon chaos and fury upon you!=¡Invocaré el caos y la furia sobre ti! Chaos will rule!=¡El caos reinará! -You see a chaos overlord. It is he who directs the creation of evil plans and gives orders to all chaotic creatures which exist.=Ves a un gran señor del caos. Es él quien dirige la creación de los planes malvados y da las órdenes a todas las criaturas que existen. I am become death, destroyer of worlds.=Me he convertido en la muerte, en el destructor de mundos. pirate=pirata -You see a bandit. Together with his partners he commits many different crimes to get much money or some rare and valuable items.=Ves a un bandido. Junto a sus compañeros comete muy diversos crímenes para conseguir mucho dinero o algunos objetos raros y valiosos. Aye, my hearties!=¡Sí, mis valientes! Yohoho and a boddle of rum!=¡Yohoho y una bodella de rón! pirate wench=chica pirata @@ -3058,13 +3003,11 @@ Who dare challenge me?=¿Quién se atreve a desafiarme? Leave me now, before it is too late!=¡Marchaos ahora, antes de que sea demasiado tarde! Meet thy maker!=¡Conoce a tu creador! Mere mortals cannot challenge me!=¡Los simples mortales no pueden desafiarme! -You see an archangel. She wants to kill you because she doesn't want you in the clouds.=Ves a una arcángel. Quiere matarte porque no quiere que estés en las nubes. Leave now, before it is too late for you.=Marchate ahora, antes de que sea demasiado tarde para ti. Your destiny is not here.=Tu destino no está aquí. Neither the earth nor the sky has a place for you...=Ni la tierra ni el cielo tienen un lugar para ti... My will be done over land and sky!=¡Mi voluntad se hará en la tierra y en el cielo! Mine is the Power and the Glory!=¡Mío es el poder y la gloria! -You see a dark archangel, after she fell from heaven her soul became as dark as she is now.=Ves a una arcángel oscura, después de que cayese del cielo su alma se volvió tan oscura como ella lo es ahora. I will strike you down with more power than you can imagine!!= ¡¡Yo te derribaré con más poder del que puedas imaginar!! My will be done!=¡Mi voluntad se hará! Giiiiiaaants! Run away!=¡Giganteeeeees! ¡Huyamos! @@ -3073,24 +3016,19 @@ Ready! Aim! Runnnnnnnnnnn=¡Preparados! ¡Apunten! ¡Corraaaaaaaaaaaan! Ready! Aim! Runnnnnnnnnnn=¡Preparados! ¡Apunten! ¡Corraaaaaaaaaaaan! Umm! Tasty meat.=¡Umm! Carne sabrosa. Breakfast time!=¡Hora de desayunar! -You see a stone golem, it exists to protect and nothing else. What was it crafted to protect, and what would one do if it lost it's purpose?=Ves a un golem de piedra, existe para proteger y nada más ¿Qué fue diseñado para proteger, y qué haría si perdiese su propósito? -You see a giant kobold. Though generally playful it doesn't quite know it's own strength. When it asks for a hug, it's best to decline that offer.=Ves a un kobold gigante. Aunque por lo general es juguetón no conoce su propia fuerza. Cuando pide un abrazo, es mejor rechazar la oferta. Hug?=¿Un abrazo? Wheee!!=¡¡Uiií!! It's fun up here!=¡Es divertido estar aquí arriba! Charrrrrrrrge!=¡A la cargaaaaaaaa! -You see black death. With his scythe he reaps your soul and then he takes it over the river where it has to stay until judgement day.=Ves a la muerte negra. Con su guadaña siega tu alma y después se la lleva al río donde tiene que permanecer hasta el día del juicio. Your time to die has come!=¡Ha llegado tu hora de morir! Say goodbye to this world!=¡Di adiós a este mundo! You will dream of me tonight...=Soñarás conmigo esta noche... You will pay for your greed!=¡Pagarás por tu codicia! Zag-Zag!=Zag-Zag! -You see a little witch. Witches are are evil little girls who are very dangerous.=Ves a una brujita. Las brujas son niñitas malvadas que son muy peligrosas. The end of the world is nigh...=El fin del mundo está cerca... Yield to the Power!=¡sometete al poder! Meet you after Cataclysm.=Nos veremos después del Cataclismo. I see you, heretic!=¡Te estoy viendo, hereje! -You see a kalavan housewife. She lives in Kalavan city and she very angry with rude people who want to steal her food out of the kitchen and destroy her beautiful flower garden!=Ves a una ama de casa kalavan. Vive en la ciudad de Kalavan y ¡se enfada mucho con la gente ruda que quiere robar comida de su cocina y destruir su precioso jardín! Ou-Garrrr!=Ou-Garrrr! Yummie!=mmmmm! The Cataclysm cometh!=¡El cometa del Cataclismo! @@ -3129,7 +3067,6 @@ I am the king of this area!=¡Soy el rey de esta área! Ouurgghh!=Ouurgghh! Growwwwwwwrrrrrrr!=Growwwwwwwrrrrrrr! Arrrrllllggggghhhh=Arrrrllllggggghhhh - You see a noble centaur, half man, half horse. He looks capable of great damage but thankfully seems to mean you no harm.=Ves a un noble centauro, mitad hombre, mitad caballo. Parece capaz de causar gran daño pero afortunadamente no parece tener intención de herirte. Revere me, the Oni King!=¡Veneradme, al Rey Oni! You must bow before the Oni Queen.=Debes inclinarte ante la Reina Oni. You, humans, never leave us alone!=¡Vosotros, los humanos, nunca nos dejáis en paz! @@ -3151,7 +3088,6 @@ Thou shall not pass!=¡No pasarás! Ooooouuuuuh!=Ooooouuuuuh! WooOouuuUuh!=WooOouuuUuh! Ghhrr!=Ghhrr! -You see a bloody zombie. Can you see the drops of blood that fall from his body?=Ves a un zombi sangriento ¿Puedes ver las gotas de sangre que caen de su cuerpo? brrraaaaaaaaaains=cereeeeeeeebrooooos Thou shall not kill!=¡No matarás! Thou shall not survive!=¡No sobrevivirás! From c6f2718aec87f61da72cc0a62c5a29189e7b1ce3 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 01:01:29 -0800 Subject: [PATCH 079/162] Remove trailing periods from translated names --- data/languages/es.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/languages/es.txt b/data/languages/es.txt index 4454b08101..1b50b1773b 100644 --- a/data/languages/es.txt +++ b/data/languages/es.txt @@ -69,7 +69,7 @@ You see a suit of mithril armor. Its tightly woven links are truly amazing.=Ves pauldroned iron cuirass=coraza de hierro con hombreras You see a formidable pauldroned iron cuirass. The pauldrons (shoulder pieces) will protect your upper half.=Ves una formidable coraza de hierro con hombreras. Las hombreras (las piezas de los hombros) protegerán tu mitad superior. -pauldroned leather cuirass=coraza de cuero con hombreras. +pauldroned leather cuirass=coraza de cuero con hombreras You see a pauldroned leather cuirass. It was crafted to withstand minor attacks.=Ves una coraza de cuero con hombreras. Fue diseñada para soportar ataques menores. plate armor=armadura de placas de acero @@ -227,7 +227,7 @@ You see a pair of mainio boots. It's hard to believe that boots looking like thi mithril boots=botas de mithril You see a sparkling set of mithril boots.=Ves un brillante conjunto de botas de mithril. -red boots=botas rojas. +red boots=botas rojas You see a pair of red boots, the color reminds you of fresh blood.=Ves un par de botas rojas, su color te recuerda a la sangre fresca. royal boots= @@ -299,7 +299,7 @@ You see an elvish cloak. The material is dark, but thick and warm.=Ves una capa golden cloak=capa de oro You see a golden cloak. See how the light glistens off the gold, it is a prized possession.=Ves una capa de oro. Ves cómo la luz brilla saliendo del oro, es una preciada posesión. -green dragon cloak=capa de dragón verde. +green dragon cloak=capa de dragón verde You see a huge green dragon cloak. It's probably too big for you but, even dragging on the floor it will provide excellent protection.=Ves una enorme capa de dragón verde. Es probablemente demasiado grande para ti pero, aunque arrastre por el suelo te proporcionará una protección excelente. lich cloak=capa de lich @@ -969,7 +969,7 @@ You see a key to the customer room of Nalwor Bank.=Ves una llave de la sala de c kotoch prison key=llave de la prisión de kotoch You see an ancient copper key, enscribed with something in Orcish.=Ves una antigua llave de cobre, grabada con algo en Orco. -kanmararn prison key=llave de la prisión de kanmararn. +kanmararn prison key=llave de la prisión de kanmararn You see a key which matches the locks in the Kanmararn prison.=Ves una llave que coincide con las cerraduras de la prisión de Kanmararn. sedah gate key=llave de la puerta de sedah @@ -1319,7 +1319,7 @@ You see a strange looking piece of moss. It looks like it could have hallucinoge ## shields -black shield=escudo negro. +black shield=escudo negro You see a black shield. Its darkness will surely protect you.=Ves un escudo negro. Su oscuridad seguro que te protegerá. blue shield=escudo azul @@ -1373,7 +1373,7 @@ You see a shadow shield. Rather than reflecting light, it seems to absorb it.=Ve skull shield=escudo de calavera The face of a skull scowls at you from this fearsome skull shield.=La cara de una calavera te frunce el ceño desde este temible escudo de calavera -studded shield=escudo tachonado. +studded shield=escudo tachonado You see a studded shield. It's a little dented but seems robust enough.=Ves un escudo tachonado. Está un poco abollado peroparece bastante robusto. unicorn shield=escudo del unicornio @@ -1570,7 +1570,7 @@ You see a fishing rod. If you find a fishing spot you can catch fish with it.=Ve lamp= You see a lamp.= -magical scissors=tijeras mágicas. +magical scissors=tijeras mágicas You see a sparkling pair of magical scissors. Just think what they could cut!=Ves un par de tijeras mágicas centelleantes ¡Piensa sólo en lo que podrían cortar! magical needle=aguja mágica @@ -1975,7 +1975,7 @@ You see a Water elemental which is made of water and various other liquids.= ent=ent You see an ent. First you think it is a tree but you will get a surprise when it starts to walk!=Ves a un ent !Primero piensas que es un árbol pero te llevas una sorpresa cuando empieza a caminar! -old ent=ent viejo. +old ent=ent viejo You see an old ent. It has seen many years passing by and survived a lot of storms. You can see that it is very old because it has already lost all of its leaves and most of its bark is broken...=Ves a un viejo ent. Ha visto muchos años pasar y ha sobrevivido a muchas tormentas. Puedes ver que es muy viejo porque ya ha perdido todas sus hojas y la mayor parte de su corteza está rota... entwife=esposaent From 79622ee9cffb3ade460888f6bb0ea204901d3ffd Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 01:12:57 -0800 Subject: [PATCH 080/162] Update Spanish translations for some renamed items --- data/languages/es.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/data/languages/es.txt b/data/languages/es.txt index 1b50b1773b..780f05286e 100644 --- a/data/languages/es.txt +++ b/data/languages/es.txt @@ -643,8 +643,8 @@ You see a carrot. It can be an ingredient, or you can eat it.=Ves una zanahoria. cauliflower=coliflor You see a fresh head of cauliflower.=Ves la cabeza de una fresca coliflor. -zucchini= -You see a zucchini. It can be an ingredient, or you can eat it.= +zucchini=calabacín +You see a zucchini. It can be an ingredient, or you can eat it.=Ves un calabacín. Puede ser un ingrediente, o te lo puedes comer. collard=col You see a collard. It's rare and strangely magical.=Ves una col. Es rara y extrañamente mágica. @@ -658,7 +658,7 @@ You see a fresh leek.=Ves un puerro fresco. onion=cebolla You see an onion.=Ves una cebolla. -lettuce= +lettuce=lechuga spinach=espinacas You see spinach. It is enriched with vitamins.=Ves espinacas. Está enriquecida con vitaminas. @@ -2881,10 +2881,6 @@ blank scroll=pergamino en blanco You see a rolled up blank scroll.=Ves un pergamino enrollado y en blanco ice scroll=pergamino de hielo You see a scroll, circled by ice crystals. You can feel its cold aura.=Ves un pergamino, rodeado por cristales de hielo. Puedes sentir su fría aura. -salad=ensalada -You see a salad.=Ves una ensalada. -courgette=calabacín -You see a courgette. It can be an ingredient, or you can eat it.=Ves un calabacín. Puede ser un ingrediente, o te lo puedes comer. fado hotel key 001=llave 001 del hotel de fado You see a key to room #001 in the Fado Hotel.=Ves una llave de la habitación #001 del hotel de Fado. fado hotel key 002=llave 002 del hotel de fado From 6608eb2b029e6f46b8beabe631485912423ec71a Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 01:20:06 -0800 Subject: [PATCH 081/162] Add Spanish translations for some newer items --- data/languages/es.txt | 104 +++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/data/languages/es.txt b/data/languages/es.txt index 780f05286e..9d75fbc993 100644 --- a/data/languages/es.txt +++ b/data/languages/es.txt @@ -111,17 +111,17 @@ You see a shining steel arrow. With plenty of these, and a good bow, you'll be a golden arrow=flecha de oro You see a golden arrow. With a fist full of these and a good bow, you will surely take down your enemies quicker.=Ves una flecha de oro. Con un puñado de éstas y un buen arco, derribarás a tus enemigos más rápido. -fire arrow= -You see a fire arrow. The tip burns brightly.= +fire arrow=flecha de fuego +You see a fire arrow. The tip burns brightly.=Ves una flecha de fuego. La punta arde brillantemente. -ice arrow= -You see an ice arrow. It can deliver a bitter sting.= +ice arrow=flecha de hielo +You see an ice arrow. It can deliver a bitter sting.=Ves una flecha de hielo. Puede infligir una picadura penosa. -light arrow= -You see a light arrow. It shines with a holy radiance.= +light arrow=flecha de luz +You see a light arrow. It shines with a holy radiance.=Ves una flecha de luz. Brilla con un resplandor santo. -dark arrow= -You see a dark arrow. It's hard to describe.= +dark arrow=flecha de oscuridad +You see a dark arrow. It's hard to describe.=Ves una flecha de oscuridad. Es difícil de describir. power arrow=flecha de potencia You see a power arrow. The sting of this arrow will surely defeat your enemies, when equipped with a bow.=Ves una flecha de potencia. La punzada de esta flecha seguramente derrotará a tus enemigos, cuando vaya equipada con un arco. @@ -186,8 +186,8 @@ You see the black book that Jynath kept out for so long.=Ves el libro negro que blue book=libro azul You see a book with the words GEMS AND MINERALS on the front cover.=Ves un libro azul con las palabras GEMAS Y MINERALES en la cubierta frontal. -bestiary= -You see a bestiary, containing information about enemies found in Faiumoni.= +bestiary=bestiario +You see a bestiary, containing information about enemies found in Faiumoni.=Ves un bestiario que contiene información sobre los enemigos encontrados en Faiumoni. ## boots @@ -320,8 +320,8 @@ You see a red cloak covered in polka dots. It's terribly snazzy.=Ves una capa ro red dragon cloak=capa de dragón rojo You see a red dragon cloak. He didn't have one for a long time but finally caved in to peer pressure and got one.=Ves una capa de dragón rojo. Él no había tenido ninguna durante mucho tiempo pero finalmente cedió a la presión de sus compañeros y se buscó una. -royal cloak= -You see a royal cloak. It will protect you against mighty foes.= +royal cloak=capa real +You see a royal cloak. It will protect you against mighty foes.=Ves una capa real. Te protegará contra enemigos poderosos. shadow cloak=capa de sombra You see a shadow cloak, in colors of the shadow armor.=Ves una capa de sombra, en los mismos colores que la armadura de sombra. @@ -416,26 +416,26 @@ You see an empty goblet. You wonder what could it hold.=Ves una copa vacía. Te goblet=copa You see a goblet. You look at its contents, and shiver at the blood inside.=Ves una copa. Miras su contenido, y sientes escalofríos al ver sangre dentro. -vial= -You see a vial used in chemestry.= +vial=ampolleta +You see a vial used in chemestry.=Ves una ampolleta utilizada en química. ## crystals -red emotion crystal= -You see a red emotion crystal. It feels hot to the touch.= +red emotion crystal=cristal rojo de emoción +You see a red emotion crystal. It feels hot to the touch.=Ves un cristal rojo de emoción. Se siente caliente al tacto. -purple emotion crystal= -You see a purple emotion crystal. It feels cold to the touch.= +purple emotion crystal=cristal morado de emoción +You see a purple emotion crystal. It feels cold to the touch.=Ves un cristal morado de emoción. Se siente frío al tacto. -yellow emotion crystal= -You see a yellow emotion crystal. It energizes you.= +yellow emotion crystal=cristal amarillo de emoción +You see a yellow emotion crystal. It energizes you.=Ves un cristal amarillo de emoción. Te da energía. -pink emotion crystal= -You see a pink emotion crystal. It almost feels soft.= +pink emotion crystal=cristal rosa de emoción +You see a pink emotion crystal. It almost feels soft.=Ves un cristal rosa de emoción. Casi se siente suave. -blue emotion crystal= -You see a blue emotion crystal. While holding it your worries seem to disappear.= +blue emotion crystal=cristal azul de emoción +You see a blue emotion crystal. While holding it your worries seem to disappear.=Ves un cristal azul de emoción. Mientras al sujetarlo tus preocupaciones parecen desaparecer. ## documents @@ -463,11 +463,11 @@ You see a hand drawn map, but no matter how you look at it, nothing on it looks ## drinks -olive oil= -You see a bottle of olive oil. Do not drink it pure, it will make you feel sick!= +olive oil=aceite de oliva +You see a bottle of olive oil. Do not drink it pure, it will make you feel sick!=Ves una botella de aceite de oliva. No lo bebas puro, ¡te hará sentir mal! -vinegar= -You see a bottle of vinegar. Do not drink it pure, it will make you feel sick!= +vinegar=vinagre +You see a bottle of vinegar. Do not drink it pure, it will make you feel sick!=Ves una botella de vinagre. No lo bebas puro, ¡te hará sentir mal! fierywater=aguardiente You see a bottle of fierywater. Do not drink it pure, you would evaporate!=Ves una botella de aguardiente. No te la bebas pura, ¡Te evaporarías! @@ -508,8 +508,8 @@ You see an antidote, to cure you of poison and protect you for a while.=Ves un a greater antidote=antidoto mayor You see a greater antidote, to cure you of poison and protect you for a long while.=Ves un antidoto mayor, para curarte de venenos y protegerte durante un largo rato. -mana= -You see an bottle of mana, to increase your mana rapidly.= +mana=maná +You see an bottle of mana, to increase your mana rapidly.=Ves una botella de maná, para rellenar tu maná rápidamente. poison=veneno You see a bottle of poison. Don't drink it!=Ves una botella de veneno ¡No te la tomes! @@ -550,17 +550,17 @@ You see a mega potion. It strengthens greatly.=Ves una mega poción. Te fortalec love potion=poción de amor You see a love potion. It looks powerful so take care to use it carefully!=Ves una poción de amor ¡Parece potente así que ten cuidado de usarla con precaución! -sedative= -You see a sedative. It's effects can protect you from a shocked state.= +sedative=sedante +You see a sedative. It's effects can protect you from a shocked state.=Ves un sedante. Sus efectos pueden protegerte de un estado de shock. -ashen holy water= -A bottle of ashen holy water.= +ashen holy water=agua santa cenizada +A bottle of ashen holy water.=Ves una botella de agua santa cenizada. -cobra venom= -You see a vial filled with cobra venom. Even in this small amount, it could be deadly if ingested.= +cobra venom=veneno de cobra +You see a vial filled with cobra venom. Even in this small amount, it could be deadly if ingested.=Ves una ampolleta llena de veneno de cobra. Aun en esta pequeña cantidad, podría ser letal si se ingiere. -antivenom= -You see a vial filled with antivenom.= +antivenom=antiveneno +You see a vial filled with antivenom.=Ves una ampolleta llena de antiveneno. ## flowers @@ -589,11 +589,11 @@ You see a zantedeschia, a delicate bloom with the sweetest fragrance.=Ves una za apple=manzana You see a nice shiny apple.=Ves una bonita y brillante manzana. -purple apple= -You see a purple apple. It is loaded with memories= +purple apple=manzana morada +You see a purple apple. It is loaded with memories=Ves una manzana morada. Está cargada de recuerdos. -mauve apple= -You see a mauve apple. It is loaded with memories= +mauve apple=manzana malva +You see a mauve apple. It is loaded with memories=Ves una manzana malva. Está cargada de recuerdos. black apple=manzana negra You see a black apple. It must be a gift from lil Johnnnny. He's the guy with black items.=Ves una manzana negra. Debe de ser un regalo del pequeño Johnnny @@ -684,8 +684,8 @@ You see a char, with a fleshy pink belly.=Ves un salvelinus, con un vientre carn cod=bacalao You see a cod.=Ves un bacalao. -smoked cod= -You see a smoked cod.= +smoked cod=bacalao ahumado +You see a smoked cod.=Ves un bacalao ahumado. mackerel=caballa You see a mackerel.=Ves una caballa. @@ -708,8 +708,8 @@ You see a bright blue surgeonfish.=Ves un pez cirujano de color azul brillante. trout=trucha You see a trout.=Ves una trucha. -smoked trout= -You see a smoked trout.= +smoked trout=trucha ahumado +You see a smoked trout.=Ves una trucha ahumada. bread=pan You see a loaf of bread. It is freshly baked and ready to eat.=Ves una barra de pan. Está recién horneada y lista para comer. @@ -732,8 +732,8 @@ You see a crepes suzette topped with hot chocolate sauce.=Ves una crepe suzette sandwich=sandwich You see a ham and cheese sandwich.=Ves un sandwich de jamón y queso. -smoked ham= -You see a smoked ham.= +smoked ham=jamón ahumado +You see a smoked ham.=Ves un jamón ahumado. sugar=azúcar You see a sack of raw sugar.=Ves un saco de azúcar no refinado. @@ -771,8 +771,8 @@ You see a scrumptious chocolate shake. Absolutely NO calories.=Ves un batido de vanilla shake=batido de vainilla You see a yummy vanilla shake. Absolutely NO calories.=Ves un sabroso batido de vainilla. Absolutamente SIN calorías. -potato= -You see a potato.= +potato=papa +You see a potato.=Ves una papa. habanero pepper= You see a habanero pepper. Could be a very HOT ingredient for a decent meal...= @@ -819,8 +819,8 @@ You see a juicy ham.=Ves un jugoso jamón. meat=carne You see a piece of meat.=Ves un pedazo de carne. -smoked meat= -You see a piece of smoked meat.= +smoked meat=carne ahumado +You see a piece of smoked meat.=Ves un trozo de carne ahumada. easter egg=huevo de pascua You see a lovely chocolate easter egg. It's huge!=Ves un encantador huevo de pascua ¡Es enorme! From cc4918a5ed5e575670da86b6e4344c2fa27a34b8 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 01:26:38 -0800 Subject: [PATCH 082/162] Add Spanish translation for map description --- data/languages/es.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/languages/es.txt b/data/languages/es.txt index 9d75fbc993..f404463533 100644 --- a/data/languages/es.txt +++ b/data/languages/es.txt @@ -458,7 +458,7 @@ assassins id=identificación de asesino You see an assassin's ID. Perhaps this can be put to good use.=Ves una identificación de asesino. Quizá puedas hacer un buen uso de ella. map=mapa -You see a hand drawn map, but no matter how you look at it, nothing on it looks familiar.= +You see a hand drawn map, but no matter how you look at it, nothing on it looks familiar.=Ves un mapa dibujado a mano. Pero por mucho que lo mires, no hay nada en él que parece familiar. ## drinks From 2ed431fd6ac12c9b513cc68c58a24392c281f8f0 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 01:27:31 -0800 Subject: [PATCH 083/162] Add Spanish translations for lemon, banana, & corn --- data/languages/es.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/languages/es.txt b/data/languages/es.txt index f404463533..24a41b8c52 100644 --- a/data/languages/es.txt +++ b/data/languages/es.txt @@ -598,11 +598,11 @@ You see a mauve apple. It is loaded with memories=Ves una manzana malva. Está c black apple=manzana negra You see a black apple. It must be a gift from lil Johnnnny. He's the guy with black items.=Ves una manzana negra. Debe de ser un regalo del pequeño Johnnny -lemon= -You see a lemon. Could be an ingredient for the right chef...= +lemon=limón +You see a lemon. Could be an ingredient for the right chef...=Ves un limón. Podría ser un ingrediente para el chef adecuado. -banana= -You see a banana. Be careful of monkeys when you have them in your bag!= +banana=banana +You see a banana. Be careful of monkeys when you have them in your bag!=Ves una banana. ¡Ten cuidado con los monos cuando las llevas en tu bolso! cherry=cereza You see a cherry. Its tangy taste revives you a little.=Ves una cereza. Su sabor amargo te revive un poco. @@ -610,8 +610,8 @@ You see a cherry. Its tangy taste revives you a little.=Ves una cereza. Su sabor coconut=coco You see a coconut. Luckily it's already cracked and you can drink from it.=Ves un coco. Afortunadamente ya está abierto y puedes beber de él. -corn= -You see an ear of corn. It could be eaten raw, grilled or turned into flour... Your choice.= +corn=maíz +You see an ear of corn. It could be eaten raw, grilled or turned into flour... Your choice.=Ves una oreja de maíz. Se puede comer cruda, asada o convertirla en harina... Tú decides. grapes= You see a bunch of grapes. They look quite juicy and tasty.= From 30494af57c59580638ee4d0991063e20eb62dee4 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 19:41:59 -0800 Subject: [PATCH 084/162] Fix running server with 'ant server_run' --- buildtools/ant_modules/dist.xml | 45 ++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/buildtools/ant_modules/dist.xml b/buildtools/ant_modules/dist.xml index 094028d19d..69e17d1822 100644 --- a/buildtools/ant_modules/dist.xml +++ b/buildtools/ant_modules/dist.xml @@ -431,24 +431,51 @@ - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + From fd2cff861815c529a7e6619c846f77cf67fe520f Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 20:27:21 -0800 Subject: [PATCH 085/162] Clean up README --- README.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 9655013187..8b25a90318 100644 --- a/README.md +++ b/README.md @@ -30,29 +30,28 @@ button to create or log in to your account. ### Mobile Play using the [progressive web app](https://en.wikipedia.org/wiki/Progressive_web_app). Just visit -https://stendhalgame.org/ in your mobile browser and click "install" when prompted. +[stendhalgame.org](https://stendhalgame.org/) in your mobile browser and click "install" when prompted. [](https://f-droid.org/packages/org.stendhalgame.client/) Play on your Android device using the dedicated app. You can get it from the -[F-Droid App Store](https://f-droid.org/) or download it from https://stendhalgame.org/download.html. +[F-Droid App Store](https://f-droid.org/) or download it from [stendhalgame.org](https://stendhalgame.org/download.html). ### Classic Desktop [![Download](https://stendhalgame.org/images/downloadbutton.png)](https://arianne-project.org/download/stendhal.zip) Play using the classic desktop client. You will need Java which you can download from -[https://www.java.com](https://www.java.com/en/download) on Microsoft Windows. Java is included in +[java.com](https://www.java.com/en/download) on Microsoft Windows. Java is included in most Linux distributions. Both Oracle Java and OpenJDK are supported. -Please download Stendhal from [https://stendhalgame.org](https://stendhalgame.org)
    -You can double click on stendhal-starter.jar and the client will run.
    -If you prefer to run from command line, then just execute this command -in the stendhal folder: +Please download Stendhal from [stendhalgame.org](https://stendhalgame.org/download.html).
    +You can double click on `stendhal-starter.jar` and the client will run.
    +If you prefer to run from command line, then just execute this command in the stendhal folder: `java -jar stendhal-starter.jar` -There is a [manual](https://stendhalgame.org/wiki/Stendhal_Manual), and there is Help from the client menu icons in the upper right hand side of the game screen. +There is a [manual](https://stendhalgame.org/wiki/Stendhal_Manual), and there is Help from the client menu icons in the upper right hand side of the game screen. ## Development environment @@ -67,7 +66,7 @@ There is a [manual](https://stendhalgame.org/wiki/Stendhal_Manual), and there i Stendhal is free software. You can redistribute it and/or modify under the following terms: -- The **server**, **java client**, and **Android client**: *GNU General Public License* 2 or later as published by the Free +- The **server**, **java client**, and **Android client**: *GNU General Public License* 2 or later as published by the Free Software Foundation - The **web client** and **native client**: *GNU Affero General Public License* 3 or later as published by the Free Software Foundation with the definition of "System libraries" being extended to include authentication providers and software distribution platforms. - The **nativehelper** extensions: *GNU Lesser General Public License* 3 or later as published by the Free Software Foundation From f9a37f122ee4c14d3222434d9626703fdd9f50f0 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 21:39:33 -0800 Subject: [PATCH 086/162] Update instances of CodeQL Action to v3 as v2 is now deprecated --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1aaaeb4e51..07b72a5c31 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -29,7 +29,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 # Override language selection by uncommenting this and choosing your languages # with: # languages: go, javascript, csharp, python, cpp, java @@ -37,7 +37,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -51,4 +51,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 From 3026afe931fb31d1b3ed1c30fea7879fe4425ef5 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Tue, 20 Jan 2026 21:52:22 -0800 Subject: [PATCH 087/162] Manually build code in CodeQL workflow as default target has changed --- .github/workflows/codeql-analysis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 07b72a5c31..3c5094235c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -36,8 +36,8 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v3 + #- name: Autobuild + # uses: github/codeql-action/autobuild@v3 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -46,9 +46,7 @@ jobs: # and modify them (or add more) to build your code if your project # uses a compiled language - #- run: | - # make bootstrap - # make release + - run: ant -noinput -f build.xml clean compile - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 From 1ca1f0e47e8fb36efd246d62011a58d7061fc239 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 23 Jan 2026 21:31:57 +0100 Subject: [PATCH 088/162] fixed undefined _hsMap() error --- src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts index e8cdd76b70..b80175b872 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts @@ -26,6 +26,7 @@ export class OutfitPaletteColorSelector extends OutfitColorSelector { this._x = 0; this._y = 0; this.hX = this.baseImage.width / 2; + this._createColorMap(); } override get color() { From 8b61de02e6b9f7d4c072968d2d119a9a0cee41af Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 23 Jan 2026 22:47:17 +0100 Subject: [PATCH 089/162] converted Singleton DrawingStage to instance and use Offscreen --- src/js/stendhal.html | 3 - src/js/stendhal/SingletonRepo.ts | 9 +-- src/js/stendhal/data/Outfit.ts | 5 +- src/js/stendhal/util/DrawingStage.ts | 93 ++++------------------------ 4 files changed, 17 insertions(+), 93 deletions(-) diff --git a/src/js/stendhal.html b/src/js/stendhal.html index 784045833f..da82552bfa 100644 --- a/src/js/stendhal.html +++ b/src/js/stendhal.html @@ -491,9 +491,6 @@ - - - diff --git a/src/js/stendhal/SingletonRepo.ts b/src/js/stendhal/SingletonRepo.ts index 2f6101bfea..ffc02e508c 100644 --- a/src/js/stendhal/SingletonRepo.ts +++ b/src/js/stendhal/SingletonRepo.ts @@ -17,7 +17,6 @@ import { Zone } from "./entity/Zone"; import { ConfigManager } from "./util/ConfigManager"; import { DownloadUtil } from "./util/DownloadUtil"; -import { DrawingStage } from "./util/DrawingStage"; import { FacingHandler } from "./util/FacingHandler"; import { KeyHandler } from "./util/KeyHandler"; import { SessionManager } from "./util/SessionManager"; @@ -48,7 +47,9 @@ import { ViewPort } from "./ui/ViewPort"; import { ChatInputComponent } from "./ui/component/ChatInputComponent"; - +/** + * @Deprecated use Class.get() directly to prevent dependency chain + */ export class SingletonRepo { static getCStatus(): CStatus { @@ -75,10 +76,6 @@ export class SingletonRepo { return DownloadUtil; } - static getDrawingStage(): DrawingStage { - return DrawingStage.get(); - } - static getEmojiStore(): EmojiStore { return EmojiStore.get(); } diff --git a/src/js/stendhal/data/Outfit.ts b/src/js/stendhal/data/Outfit.ts index baf132784a..69629ba974 100644 --- a/src/js/stendhal/data/Outfit.ts +++ b/src/js/stendhal/data/Outfit.ts @@ -219,9 +219,7 @@ export class Outfit { return; } - const stage = DrawingStage.get(); - stage.reset(); - stage.setSize(48 * 3, 64 * 4); + let stage = new DrawingStage(48 * 3, 64 * 4); let outfitLayers = this.getLayers(); const detailIndex = this.getLayerIndex("detail") || 0; @@ -275,7 +273,6 @@ export class Outfit { stage.drawImage(layer); } image = stage.toImage() as SpriteImage; - stage.reset(); image.counter = 1; singletons.getSpriteStore().cache(sig, image); if (image.height > 0) { diff --git a/src/js/stendhal/util/DrawingStage.ts b/src/js/stendhal/util/DrawingStage.ts index b62531772c..426c5224a9 100644 --- a/src/js/stendhal/util/DrawingStage.ts +++ b/src/js/stendhal/util/DrawingStage.ts @@ -10,7 +10,7 @@ * * ***************************************************************************/ -import { RenderingContext2D } from "./Types"; +import { Canvas, RenderingContext2D } from "./Types"; /** @@ -19,105 +19,38 @@ import { RenderingContext2D } from "./Types"; export class DrawingStage { /** Hidden canvas element. */ - private canvas: HTMLCanvasElement; + private canvas: Canvas; /** Canvas's drawing context. */ private ctx: RenderingContext2D; - /** Singleton instance. */ - private static instance: DrawingStage; - /** - * Retrieves the singleton instance. + * create new DrawingStage * - * @returns {DrawingStage} - * Drawing stage instance. + * @param width the canvas width. + * @param height the canvas height. */ - static get(): DrawingStage { - if (!DrawingStage.instance) { - DrawingStage.instance = new DrawingStage(); - } - return DrawingStage.instance; - } - - /** - * Hidden singleton constructor. - */ - private constructor() { - this.canvas = document.getElementById("drawing-stage")! as HTMLCanvasElement; + constructor(width: number, height: number) { + this.canvas = new OffscreenCanvas(width, height); this.ctx = this.canvas.getContext("2d")!; - this.reset(); } - /** - * Clears canvas & resets dimensions to 0x0. - */ - reset() { - this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); - this.setSize(0, 0); - } /** - * Sets dimensions of drawing canvas. + * Converts canvas * - * @param {number} width - * New canvas width. - * @param {number} height - * New canvas height. + * @returns new image */ - setSize(width: number, height: number) { - this.canvas.width = width; - this.canvas.height = height; - } - - /** - * Compares canvas dimensions against image and adjusts if necessary. - * - * @param {HTMLImageElement} image - * Image to compare against. - */ - private checkSize(image: HTMLImageElement) { - if (this.canvas.width < image.width || this.canvas.height < image.height) { - this.setSize(image.width, image.height); - } - } - - /** - * Converts canvas data to PNG data URL. - * - * @returns {string} - * PNG data encoded string. - */ - // TODO: Do we really need this? We could use an offscreen canvas otherwise - toDataURL(): string { - return this.canvas.toDataURL("image/png"); - } - - /** - * Converts canvas data to PNG image. - * - * @returns {HTMLImageElement} - * New image element. - */ - toImage(): HTMLImageElement { - const image = new Image(); - image.src = this.toDataURL(); - return image; + toImage(): CanvasImageSource { + return this.canvas; } /** * Draws an image on the canvas. * - * @param {HTMLImageElement} image - * Image to be drawn. - * @param {boolean} [reset=false] - * If `true` erases current image data before drawing. + * @param image Image to be drawn. */ - drawImage(image: HTMLImageElement, reset=false) { - if (reset) { - this.reset(); - } - this.checkSize(image); + drawImage(image: CanvasImageSource) { this.ctx.drawImage(image, 0, 0); } } From e121d44356e8204ab06012d14d3489413ba5621f Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 23 Jan 2026 22:47:34 +0100 Subject: [PATCH 090/162] added TODOs and fixed compiler warnings --- src/js/stendhal/landscape/CombinedTilesetImageLoader.ts | 1 + src/js/stendhal/ui/component/OutfitPreviewComponent.ts | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index 1a69360d7d..91e69940d6 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -70,6 +70,7 @@ export class CombinedTilesetImageLoader { return; } let url = tsname + "?v=" + stendhal.data.build.version; + // TODO: deal with errors let response = await fetch(url); if (!response.ok) { return; diff --git a/src/js/stendhal/ui/component/OutfitPreviewComponent.ts b/src/js/stendhal/ui/component/OutfitPreviewComponent.ts index 4bfa862471..f65514c84a 100644 --- a/src/js/stendhal/ui/component/OutfitPreviewComponent.ts +++ b/src/js/stendhal/ui/component/OutfitPreviewComponent.ts @@ -16,7 +16,6 @@ import { Outfit } from "../../data/Outfit"; import { Direction } from "../../util/Direction"; import { StringUtil } from "../../util/StringUtil"; -import { Canvas } from "util/Types"; /** From ba6d507924f75840f29fa580789cbc2e6f5103f9 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Fri, 23 Jan 2026 23:00:04 +0100 Subject: [PATCH 091/162] inlined DrawingStage into Outfit --- src/js/stendhal/data/Outfit.ts | 14 +++---- src/js/stendhal/util/DrawingStage.ts | 56 ---------------------------- 2 files changed, 5 insertions(+), 65 deletions(-) delete mode 100644 src/js/stendhal/util/DrawingStage.ts diff --git a/src/js/stendhal/data/Outfit.ts b/src/js/stendhal/data/Outfit.ts index 69629ba974..849200388b 100644 --- a/src/js/stendhal/data/Outfit.ts +++ b/src/js/stendhal/data/Outfit.ts @@ -219,8 +219,6 @@ export class Outfit { return; } - let stage = new DrawingStage(48 * 3, 64 * 4); - let outfitLayers = this.getLayers(); const detailIndex = this.getLayerIndex("detail") || 0; if (stendhal.data.outfit.detailHasRearLayer(detailIndex)) { @@ -268,18 +266,16 @@ export class Outfit { }; onAllLayersReady = function() { + let canvas = new OffscreenCanvas(48 * 3, 64 * 4); + let ctx = canvas.getContext("2d")!; for (const layer of layers) { layer.removeEventListener("load", onLayerReady); - stage.drawImage(layer); + ctx.drawImage(layer, 0, 0); } - image = stage.toImage() as SpriteImage; + image = canvas as unknown as SpriteImage; // TODO clean this up image.counter = 1; singletons.getSpriteStore().cache(sig, image); - if (image.height > 0) { - onReady(); - } else { - image.addEventListener("load", onReady); - } + onReady(); }; for (const layer of layers) { diff --git a/src/js/stendhal/util/DrawingStage.ts b/src/js/stendhal/util/DrawingStage.ts deleted file mode 100644 index 426c5224a9..0000000000 --- a/src/js/stendhal/util/DrawingStage.ts +++ /dev/null @@ -1,56 +0,0 @@ -/*************************************************************************** - * Copyright © 2024 - Faiumoni e. V. * - *************************************************************************** - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - ***************************************************************************/ - -import { Canvas, RenderingContext2D } from "./Types"; - - -/** - * Hidden canvas for manipulating images before they are displayed. - */ -export class DrawingStage { - - /** Hidden canvas element. */ - private canvas: Canvas; - /** Canvas's drawing context. */ - private ctx: RenderingContext2D; - - - /** - * create new DrawingStage - * - * @param width the canvas width. - * @param height the canvas height. - */ - constructor(width: number, height: number) { - this.canvas = new OffscreenCanvas(width, height); - this.ctx = this.canvas.getContext("2d")!; - } - - - /** - * Converts canvas - * - * @returns new image - */ - toImage(): CanvasImageSource { - return this.canvas; - } - - /** - * Draws an image on the canvas. - * - * @param image Image to be drawn. - */ - drawImage(image: CanvasImageSource) { - this.ctx.drawImage(image, 0, 0); - } -} From f9fc0230f50ed1081f988d42f4d07ffe90ae663b Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 24 Jan 2026 15:13:40 +0100 Subject: [PATCH 092/162] use OffscreenCanvas --- src/js/stendhal/sprite/ImageSprite.ts | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/js/stendhal/sprite/ImageSprite.ts b/src/js/stendhal/sprite/ImageSprite.ts index 7a63c16fb4..68106b9746 100644 --- a/src/js/stendhal/sprite/ImageSprite.ts +++ b/src/js/stendhal/sprite/ImageSprite.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -51,10 +51,8 @@ export class ImageSprite implements Sprite { } private static createCompatibleImage(sprite: Sprite): Canvas { - const canvas = document.createElement('canvas'); + const canvas = new OffscreenCanvas(sprite.getWidth(), sprite.getHeight()); const g = canvas.getContext('2d'); - canvas.width = sprite.getWidth(); - canvas.height = sprite.getHeight(); sprite.draw(g!, 0, 0); return canvas; } @@ -91,11 +89,8 @@ export class ImageSprite implements Sprite { height = Math.min(height, iheight); // Full copy method (the memory hog) - const canvas = document.createElement('canvas'); + const canvas = new OffscreenCanvas(width, height); const g = canvas.getContext('2d'); - canvas.width = width; - canvas.height = height; - this.draw(g!, 0, 0, x, y, width, height); return new ImageSprite(canvas, ref); From 662aab6ded2d12752156ff0bce1ee3275c857a17 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 24 Jan 2026 18:39:35 +0100 Subject: [PATCH 093/162] use ImageBitmap for minimap static collisions --- src/js/stendhal/data/Outfit.ts | 1 - src/js/stendhal/ui/component/MiniMapComponent.ts | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/js/stendhal/data/Outfit.ts b/src/js/stendhal/data/Outfit.ts index 849200388b..9c02d16de0 100644 --- a/src/js/stendhal/data/Outfit.ts +++ b/src/js/stendhal/data/Outfit.ts @@ -11,7 +11,6 @@ ***************************************************************************/ import { singletons } from "../SingletonRepo"; -import { DrawingStage } from "../util/DrawingStage"; import { Pair } from "../util/Pair"; import { StringUtil } from "../util/StringUtil"; import { Paths } from "./Paths"; diff --git a/src/js/stendhal/ui/component/MiniMapComponent.ts b/src/js/stendhal/ui/component/MiniMapComponent.ts index 3add856cc7..5557eb6a86 100644 --- a/src/js/stendhal/ui/component/MiniMapComponent.ts +++ b/src/js/stendhal/ui/component/MiniMapComponent.ts @@ -16,7 +16,7 @@ import { Component } from "../toolkit/Component"; import { Player } from "../../entity/Player"; import { Color } from "../../data/color/Color"; -import { Canvas, RenderingContext2D } from "util/Types"; +import { RenderingContext2D } from "util/Types"; import { stendhal } from "stendhal"; @@ -33,7 +33,7 @@ export class MiniMapComponent extends Component { private mapWidth = 1; private mapHeight = 1; private scale = 1; - private bgImage!: Canvas; + private bgImage?: ImageBitmap; private lastZone?: number[]; // ground/collision colors @@ -140,8 +140,8 @@ export class MiniMapComponent extends Component { if (stendhal.data.map.collisionData !== this.lastZone) { this.lastZone = stendhal.data.map.collisionData; - this.bgImage = document.createElement("canvas"); - let ctx = this.bgImage.getContext("2d")!; + let canvas = new OffscreenCanvas(width, height); + let ctx = canvas.getContext("2d")!; let imgData = ctx.createImageData(width, height); for (let y = 0; y < height; y++) { @@ -162,10 +162,11 @@ export class MiniMapComponent extends Component { imgData.data[pos + 3] = 255; // opacity } } - this.bgImage.width = width; - this.bgImage.height = height; - ctx.putImageData(imgData, 0, 0); + if (this.bgImage) { + this.bgImage.close(); + } + this.bgImage = canvas.transferToImageBitmap(); } } From 4feb1e628a933fc6d0e104bd5472bb7ff19fb39c Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 24 Jan 2026 23:13:03 +0100 Subject: [PATCH 094/162] use OffscreenCanvas to create outfit sprite --- src/js/stendhal/entity/RPEntity.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/js/stendhal/entity/RPEntity.ts b/src/js/stendhal/entity/RPEntity.ts index 5fb8bf79fd..e4c1a47b2d 100644 --- a/src/js/stendhal/entity/RPEntity.ts +++ b/src/js/stendhal/entity/RPEntity.ts @@ -270,10 +270,8 @@ export class RPEntity extends ActiveEntity { const lsprite = this.getOutfitPart(layer, outfit[layer], outfit["body"]); if (lsprite && lsprite.complete && lsprite.height) { if (!this.octx) { - let ocanvas = document.createElement("canvas"); + let ocanvas = new OffscreenCanvas(lsprite.width, lsprite.height); this.octx = ocanvas.getContext("2d")!; - ocanvas.width = lsprite.width; - ocanvas.height = lsprite.height; } this.octx!.drawImage(lsprite, 0, 0); } From 1c50a2a4545fbd1cca59a4aa443916765034a4ef Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 25 Jan 2026 01:40:28 +0100 Subject: [PATCH 095/162] moved sprite/image/ImageFilter out of data/SpriteStore --- src/js/stendhal/data/SpriteStore.ts | 183 +---------------- src/js/stendhal/sprite/image/ImageFilter.ts | 186 ++++++++++++++++++ .../ui/dialog/outfit/OutfitColorSelector.ts | 26 ++- .../outfit/OutfitPaletteColorSelector.ts | 21 +- 4 files changed, 220 insertions(+), 196 deletions(-) create mode 100644 src/js/stendhal/sprite/image/ImageFilter.ts diff --git a/src/js/stendhal/data/SpriteStore.ts b/src/js/stendhal/data/SpriteStore.ts index e67982a079..8cc39b72c8 100644 --- a/src/js/stendhal/data/SpriteStore.ts +++ b/src/js/stendhal/data/SpriteStore.ts @@ -12,6 +12,7 @@ import { stendhal } from "../stendhal"; import { Paths } from "./Paths"; +import { ImageFilter } from "../sprite/image/ImageFilter"; export class SpriteImage extends Image { @@ -314,10 +315,7 @@ export class SpriteStore { */ getFiltered(fileName: string, filter: string, param?: number) { const img = this.get(fileName); - let filterFn; - if (typeof(filter) === "undefined" - || !(filterFn = this.filter[filter]) - || !img.complete || img.width === 0 || img.height === 0) { + if (!img.complete || img.width === 0 || img.height === 0) { return img; } const filteredName = fileName + " " + filter + " " + param; @@ -329,8 +327,7 @@ export class SpriteStore { const ctx = canvas.getContext("2d")!; ctx.drawImage(img, 0, 0); const imgData = ctx.getImageData(0, 0, img.width, img.height); - const data = imgData.data; - filterFn(data, param); + new ImageFilter().filter(imgData, filter, param); ctx.putImageData(imgData, 0, 0); canvas.complete = true; this.images[filteredName] = filtered = canvas as SpriteImage; @@ -347,10 +344,7 @@ export class SpriteStore { getFilteredWithPromise(fileName: string, filter: string, param?: number) { const imgPromise = this.getWithPromise(fileName); return imgPromise.then(function (img: HTMLImageElement) { - let filterFn: Function; - if (typeof(filter) === "undefined" - || !(filterFn = stendhal.data.sprites.filter[filter]) - || !img.complete || img.width === 0 || img.height === 0) { + if (!img.complete || img.width === 0 || img.height === 0) { return img; } const filteredName = fileName + " " + filter + " " + param; @@ -362,8 +356,7 @@ export class SpriteStore { const ctx = canvas.getContext("2d")!; ctx.drawImage(img, 0, 0); const imgData = ctx.getImageData(0, 0, img.width, img.height); - const data = imgData.data; - filterFn(data, param); + new ImageFilter().filter(imgData, filter, param); ctx.putImageData(imgData, 0, 0); canvas.complete = true; stendhal.data.sprites.images[filteredName] = filtered = canvas as SpriteImage; @@ -374,153 +367,7 @@ export class SpriteStore { } - /** Image filters */ - filter: {[key: string]: Function} = { - // Helper functions - /** - * @param {Number} rgb - * @return {Array} - */ - splitrgb: function(rgb: number): number[] { - rgb &= 0xffffff; - var b = rgb & 0xff; - rgb >>>= 8; - var g = rgb & 0xff; - rgb >>>= 8; - return [rgb, g, b]; - }, - mergergb: function(rgbArray: number[]): number { - const r = rgbArray[0] << 16; - const g = rgbArray[1] << 8; - return 0xffffff & (r | g | rgbArray[2]); - }, - - /** - * @param {Array} rgb - * @return {Array} - */ - rgb2hsl: function(rgb: number[]): number[] { - var r = rgb[0] / 255; - var g = rgb[1] / 255; - var b = rgb[2] / 255; - - var max, min, maxVar; - // Find the max and minimum colors, and remember which one it was - if (r > g) { - max = r; - min = g; - maxVar = 0; - } else { - max = g; - min = r; - maxVar = 1; - } - if (b > max) { - max = b; - maxVar = 2; - } else if (b < min) { - min = b; - } - - // lightness - var l = (max + min) / 2; - var s, h; - - // saturation - var diff = max - min; - if (diff < 0.000001) { - s = 0; - // hue not really defined, but set it to something reasonable - h = 0; - } else { - if (l < 0.5) { - s = diff / (max + min); - } else { - s = diff / (2 - max - min); - } - - // hue - if (maxVar === 0) { - h = (g - b) / diff; - } else if (maxVar === 1) { - h = 2 + (b - r) / diff; - } else { - h = 4 + (r - g) / diff; - } - // Normalize to range [0, 1]. It's more useful than the usual 360 - h /= 6; - } - - return [h, s, l]; - }, - - /** - * @param {Array} hsl - * @return {Array} - */ - hsl2rgb: function(hsl: number[]): number[] { - var r, g, b; - var h = hsl[0]; - var s = hsl[1]; - var l = hsl[2]; - - if (s < 0.0000001) { - r = g = b = Math.floor(255 * l); - } else { - var tmp1, tmp2; - if (l < 0.5) { - tmp1 = l * (1 + s); - } else { - tmp1 = l + s - l * s; - } - tmp2 = 2 * l - tmp1; - - var rf = stendhal.data.sprites.filter.hue2rgb(this.limitHue(h + 1/3), tmp2, tmp1); - var gf = stendhal.data.sprites.filter.hue2rgb(this.limitHue(h), tmp2, tmp1); - var bf = stendhal.data.sprites.filter.hue2rgb(this.limitHue(h - 1/3), tmp2, tmp1); - - r = Math.floor(255 * rf) & 0xff; - g = Math.floor(255 * gf) & 0xff; - b = Math.floor(255 * bf) & 0xff; - } - - return [r, g, b]; - }, - - /** - * @param {Number} hue - * @param {Number} val1 - * @param {Number} val2 - */ - hue2rgb: function(hue: number, val1: number, val2: number): number { - var res = hue; - if (6 * hue < 1) { - res = val1 + (val2 - val1) * 6 * hue; - } else if (2 * hue < 1) { - res = val2; - } else if (3 * hue < 2) { - res = val1 + (val2 - val1) * (2/3 - hue) * 6; - } else { - res = val1; - } - - return res; - }, - - /** - * @param {Number} hue - */ - limitHue: function(hue: number): number { - var res = hue; - if (res < 0) { - res += 1; - } else if (res > 1) { - res -= 1; - } - return res; - } - } /** * Retrieves a shadow sprite if the style is available. @@ -597,23 +444,3 @@ class SpriteStoreInternal extends SpriteStore { // SpriteStore singleton instance export const store = SpriteStoreInternal.get(); -// *** Image filters. Prevent the closure compiler from mangling the names. *** -store.filter['trueColor'] = function(data: any, color: number) { - var hslColor = stendhal.data.sprites.filter.rgb2hsl(stendhal.data.sprites.filter.splitrgb(color)); - var end = data.length; - for (var i = 0; i < end; i += 4) { - var rgb = [data[i], data[i + 1], data[i + 2]]; - var hsl = stendhal.data.sprites.filter.rgb2hsl(rgb); - // Adjust the brightness - var adj = hslColor[2] - 0.5; // [-0.5, 0.5] - var tmp = hsl[2] - 0.5; // [-0.5, 0.5] - // tweaks the middle lights either upward or downward, depending - // on if source lightness is high or low - var l = hsl[2] - 2.0 * adj * ((tmp * tmp) - 0.25); - var resultHsl = [hslColor[0], hslColor[1], l]; - var resultRgb = stendhal.data.sprites.filter.hsl2rgb(resultHsl); - data[i] = resultRgb[0]; - data[i+1] = resultRgb[1]; - data[i+2] = resultRgb[2]; - } -}; diff --git a/src/js/stendhal/sprite/image/ImageFilter.ts b/src/js/stendhal/sprite/image/ImageFilter.ts new file mode 100644 index 0000000000..78819e449b --- /dev/null +++ b/src/js/stendhal/sprite/image/ImageFilter.ts @@ -0,0 +1,186 @@ +/*************************************************************************** + * (C) Copyright 2003-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +export class ImageFilter { + // Helper functions + /** + * @param {Number} rgb + * @return {Array} + */ + splitrgb(rgb: number): number[] { + rgb &= 0xffffff; + var b = rgb & 0xff; + rgb >>>= 8; + var g = rgb & 0xff; + rgb >>>= 8; + return [rgb, g, b]; + } + + mergergb(rgbArray: number[]): number { + const r = rgbArray[0] << 16; + const g = rgbArray[1] << 8; + return 0xffffff & (r | g | rgbArray[2]); + } + + /** + * @param {Array} rgb + * @return {Array} + */ + rgb2hsl(rgb: number[]): number[] { + var r = rgb[0] / 255; + var g = rgb[1] / 255; + var b = rgb[2] / 255; + + var max, min, maxVar; + // Find the max and minimum colors, and remember which one it was + if (r > g) { + max = r; + min = g; + maxVar = 0; + } else { + max = g; + min = r; + maxVar = 1; + } + if (b > max) { + max = b; + maxVar = 2; + } else if (b < min) { + min = b; + } + + // lightness + var l = (max + min) / 2; + var s, h; + + // saturation + var diff = max - min; + if (diff < 0.000001) { + s = 0; + // hue not really defined, but set it to something reasonable + h = 0; + } else { + if (l < 0.5) { + s = diff / (max + min); + } else { + s = diff / (2 - max - min); + } + + // hue + if (maxVar === 0) { + h = (g - b) / diff; + } else if (maxVar === 1) { + h = 2 + (b - r) / diff; + } else { + h = 4 + (r - g) / diff; + } + // Normalize to range [0, 1]. It's more useful than the usual 360 + h /= 6; + } + + return [h, s, l]; + } + + /** + * @param {Array} hsl + * @return {Array} + */ + hsl2rgb(hsl: number[]): number[] { + var r, g, b; + var h = hsl[0]; + var s = hsl[1]; + var l = hsl[2]; + + if (s < 0.0000001) { + r = g = b = Math.floor(255 * l); + } else { + var tmp1, tmp2; + if (l < 0.5) { + tmp1 = l * (1 + s); + } else { + tmp1 = l + s - l * s; + } + tmp2 = 2 * l - tmp1; + + var rf = this.hue2rgb(this.limitHue(h + 1 / 3), tmp2, tmp1); + var gf = this.hue2rgb(this.limitHue(h), tmp2, tmp1); + var bf = this.hue2rgb(this.limitHue(h - 1 / 3), tmp2, tmp1); + + r = Math.floor(255 * rf) & 0xff; + g = Math.floor(255 * gf) & 0xff; + b = Math.floor(255 * bf) & 0xff; + } + + return [r, g, b]; + } + + /** + * @param {Number} hue + * @param {Number} val1 + * @param {Number} val2 + */ + private hue2rgb(hue: number, val1: number, val2: number): number { + var res = hue; + if (6 * hue < 1) { + res = val1 + (val2 - val1) * 6 * hue; + } else if (2 * hue < 1) { + res = val2; + } else if (3 * hue < 2) { + res = val1 + (val2 - val1) * (2 / 3 - hue) * 6; + } else { + res = val1; + } + + return res; + } + + /** + * @param {Number} hue + */ + private limitHue(hue: number): number { + var res = hue; + if (res < 0) { + res += 1; + } else if (res > 1) { + res -= 1; + } + return res; + } + + private trueColor(data: any, color: number) { + var hslColor = this.rgb2hsl(this.splitrgb(color)); + var end = data.length; + for (var i = 0; i < end; i += 4) { + var rgb = [data[i], data[i + 1], data[i + 2]]; + var hsl = this.rgb2hsl(rgb); + // Adjust the brightness + var adj = hslColor[2] - 0.5; // [-0.5, 0.5] + var tmp = hsl[2] - 0.5; // [-0.5, 0.5] + // tweaks the middle lights either upward or downward, depending + // on if source lightness is high or low + var l = hsl[2] - 2.0 * adj * ((tmp * tmp) - 0.25); + var resultHsl = [hslColor[0], hslColor[1], l]; + var resultRgb = this.hsl2rgb(resultHsl); + data[i] = resultRgb[0]; + data[i + 1] = resultRgb[1]; + data[i + 2] = resultRgb[2]; + } + } + + public filter(data: ImageData, filter: string, param?: number): void { + if (filter ==='trueColor') { + this.trueColor(data.data, param!); + } else { + console.log("Unknown filter name " + filter); + } + } +} + diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts index 71dd029e7e..91989115f3 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitColorSelector.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2015-2023 - Faiumoni e. V. * + * (C) Copyright 2015-2026 - Faiumoni e. V. * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -11,6 +11,8 @@ import { singletons } from "../../../SingletonRepo"; import { Canvas, RenderingContext2D } from "util/Types"; +import { ImageFilter } from "../../../sprite/image/ImageFilter"; + export class OutfitColorSelector { protected ctx: RenderingContext2D; @@ -51,17 +53,19 @@ export class OutfitColorSelector { get color() { if (this.enabled) { + let filter = new ImageFilter(); const hsl = [this._x / this.baseImage.width, 1 - this._y / this.baseImage.height, this.hX / this.baseImage.width]; - const rgbArray = singletons.getSpriteStore().filter.hsl2rgb(hsl); - return singletons.getSpriteStore().filter.mergergb(rgbArray); + const rgbArray = filter.hsl2rgb(hsl); + return filter.mergergb(rgbArray); } return null; } set color(rgb) { if (rgb != null) { - const hsl = singletons.getSpriteStore().filter.rgb2hsl(singletons.getSpriteStore().filter.splitrgb(rgb)); + let filter = new ImageFilter(); + const hsl = filter.rgb2hsl(filter.splitrgb(rgb)); this._x = hsl[0] * this.baseImage.width; this._y = (1 - hsl[1]) * this.baseImage.height; this.hX = hsl[2] * this.baseImage.width; @@ -76,10 +80,11 @@ export class OutfitColorSelector { img.width = width; img.height = height; const ctx = img.getContext("2d")!; + let filter = new ImageFilter(); for (let x = 0; x < width; x++) { for (let y = 0; y < height; y++) { const hsl = [x / width, 1 - y / height, 0.5]; - const rgb = singletons.getSpriteStore().filter.hsl2rgb(hsl); + const rgb = filter.hsl2rgb(hsl); ctx.fillStyle = this._rgbToCssString(rgb); ctx.fillRect(x, y, 1, 1); } @@ -87,8 +92,8 @@ export class OutfitColorSelector { return img; } - _rgbToCssString(rgb: string[]) { - return "rgb(".concat(rgb[0], ",", rgb[1], ",", rgb[2], ")"); + _rgbToCssString(rgb: string[]|number[]) { + return "rgb(" + rgb[0] + "," + rgb[1] + "," + rgb[2] + ")"; } draw() { @@ -136,14 +141,15 @@ export class OutfitColorSelector { } _calculateGradientStops() { + let filter = new ImageFilter(); const width = this.baseImage.width; const height = this.baseImage.height; const hslLeft = [this._x / width, 1 - this._y / height, 0.08]; const hslMiddle = [this._x / width, 1 - this._y / height, 0.5]; const hslRight = [this._x / width, 1 - this._y / height, 0.92]; - const rgbLeft = singletons.getSpriteStore().filter.hsl2rgb(hslLeft); - const rgbMiddle = singletons.getSpriteStore().filter.hsl2rgb(hslMiddle); - const rgbRight = singletons.getSpriteStore().filter.hsl2rgb(hslRight); + const rgbLeft = filter.hsl2rgb(hslLeft); + const rgbMiddle = filter.hsl2rgb(hslMiddle); + const rgbRight = filter.hsl2rgb(hslRight); return [rgbLeft, rgbMiddle, rgbRight]; } diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts index b80175b872..88414ae73b 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitPaletteColorSelector.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2015-2023 - Faiumoni e. V. * + * (C) Copyright 2015-2026 - Faiumoni e. V. * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -11,6 +11,7 @@ import { singletons } from "../../../SingletonRepo"; import { OutfitColorSelector } from "./OutfitColorSelector"; +import { ImageFilter } from "../../../sprite/image/ImageFilter"; export class OutfitPaletteColorSelector extends OutfitColorSelector { @@ -31,10 +32,11 @@ export class OutfitPaletteColorSelector extends OutfitColorSelector { override get color() { if (this.enabled) { + let filter = new ImageFilter(); const hs = this._hsMap[Math.floor(this._x / this._blockWidth)][Math.floor(this._y / this._blockHeight)]; const hsl = [hs[0], hs[1], this.hX / this.baseImage.width]; - const rgbArray = singletons.getSpriteStore().filter.hsl2rgb(hsl); - return singletons.getSpriteStore().filter.mergergb(rgbArray); + const rgbArray = filter.hsl2rgb(hsl); + return filter.mergergb(rgbArray); } return null; } @@ -42,7 +44,8 @@ export class OutfitPaletteColorSelector extends OutfitColorSelector { override set color(rgb) { if (rgb != null) { this.enabled = true; - const hsl = singletons.getSpriteStore().filter.rgb2hsl(singletons.getSpriteStore().filter.splitrgb(rgb)); + let filter = new ImageFilter(); + const hsl = filter.rgb2hsl(filter.splitrgb(rgb)); this.hX = hsl[2] * this.baseImage.width; let bestDelta = Number.MAX_VALUE; for (let i = 0; i < 4; i++) { @@ -68,12 +71,13 @@ export class OutfitPaletteColorSelector extends OutfitColorSelector { const saturations = [0.70, 0.55, 0.40, 0.25]; const hsMap: any = [[],[],[],[]]; const colors: any = [[],[],[],[]]; + let filter = new ImageFilter(); for (let i = 0; i < 4; i++) { for (let j = 0; j < 4; j++) { const hue = hues[j]; const sat = saturations[i]; hsMap[i].push([hue, sat]); - const color = singletons.getSpriteStore().filter.hsl2rgb([hue, sat, 0.5]); + const color = filter.hsl2rgb([hue, sat, 0.5]); colors[i].push(color); } } @@ -102,13 +106,14 @@ export class OutfitPaletteColorSelector extends OutfitColorSelector { } override _calculateGradientStops() { + let filter = new ImageFilter(); let hs = this._hsMap[Math.floor(this._x / this._blockWidth)][Math.floor(this._y / this._blockHeight)]; const hslLeft = [hs[0], hs[1], 0.08]; const hslMiddle = [hs[0], hs[1], 0.5]; const hslRight = [hs[0], hs[1], 0.92]; - const rgbLeft = singletons.getSpriteStore().filter.hsl2rgb(hslLeft); - const rgbMiddle = singletons.getSpriteStore().filter.hsl2rgb(hslMiddle); - const rgbRight = singletons.getSpriteStore().filter.hsl2rgb(hslRight); + const rgbLeft = filter.hsl2rgb(hslLeft); + const rgbMiddle = filter.hsl2rgb(hslMiddle); + const rgbRight = filter.hsl2rgb(hslRight); return [rgbLeft, rgbMiddle, rgbRight]; } From 79ba39a030f08ffa7ebe6e240d5746a017e06267 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 25 Jan 2026 01:41:35 +0100 Subject: [PATCH 096/162] fixed moduleResolution setting --- src/js/stendhal/tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/stendhal/tsconfig.json b/src/js/stendhal/tsconfig.json index 2e38d48a2f..253d705239 100644 --- a/src/js/stendhal/tsconfig.json +++ b/src/js/stendhal/tsconfig.json @@ -3,6 +3,7 @@ "baseUrl": ".", "lib": ["dom", "es2022"], "module": "node20", + "moduleResolution": "nodenext", "noImplicitOverride": true, "outDir": "../../../build/ts", "rootDir": ".", From 93a99c9c1065ba518dd231c54bd7a66c3a9a4a02 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 25 Jan 2026 01:53:13 +0100 Subject: [PATCH 097/162] moved CombinedTilesetRenderingStrategy out of LandscapeRenderingStrategy --- src/js/stendhal/data/TileMap.ts | 3 +- .../CombinedTilesetRenderingStrategy.ts | 51 +++++++++++++++++++ .../landscape/LandscapeRenderingStrategy.ts | 34 ------------- 3 files changed, 53 insertions(+), 35 deletions(-) create mode 100644 src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts diff --git a/src/js/stendhal/data/TileMap.ts b/src/js/stendhal/data/TileMap.ts index 30102ee7b9..ebd62a6154 100644 --- a/src/js/stendhal/data/TileMap.ts +++ b/src/js/stendhal/data/TileMap.ts @@ -14,7 +14,8 @@ import { stendhal } from "../stendhal"; import { Paths } from "./Paths"; -import { LandscapeRenderingStrategy, CombinedTilesetRenderingStrategy } from "../landscape/LandscapeRenderingStrategy"; +import { LandscapeRenderingStrategy } from "../landscape/LandscapeRenderingStrategy"; +import { CombinedTilesetRenderingStrategy } from "../landscape/CombinedTilesetRenderingStrategy"; import { IndividualTilesetRenderingStrategy } from "../landscape/IndividualTilesetRenderingStrategy"; import { ParallaxBackground } from "../landscape/ParallaxBackground"; diff --git a/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts b/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts new file mode 100644 index 0000000000..25261638ad --- /dev/null +++ b/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts @@ -0,0 +1,51 @@ +/*************************************************************************** + * (C) Copyright 2022-2026 - Faiumoni e. V. * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { stendhal } from "../stendhal"; +import { LandscapeRenderingStrategy } from "./LandscapeRenderingStrategy"; +import { Canvas } from "util/Types"; +import { TileMap } from "../data/TileMap"; +import { CombinedTilesetFactory } from "./CombinedTilesetFactory"; +import { LandscapeRenderer } from "./LandscapeRenderer"; + +export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy { + + public onMapLoaded(map: TileMap): void { + let combinedTilesetFactory = new CombinedTilesetFactory(map); + stendhal.data.map.combinedTileset = combinedTilesetFactory.combine(); + } + + public onTilesetLoaded(): void { + let body = document.getElementById("body")!; + body.style.cursor = "auto"; + } + + public render( + canvas: Canvas, gamewindow: any, + tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void { + + let landscapeRenderder = new LandscapeRenderer(); + landscapeRenderder.drawLayer( + canvas, + stendhal.data.map.combinedTileset, + 0, + tileOffsetX, tileOffsetY, targetTileWidth, targetTileHeight); + + gamewindow.drawEntities(); + + landscapeRenderder.drawLayer( + canvas, + stendhal.data.map.combinedTileset, + 1, + tileOffsetX, tileOffsetY, targetTileWidth, targetTileHeight); + } + +} diff --git a/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts b/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts index 297a93ed2a..1702419d87 100644 --- a/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts +++ b/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts @@ -28,37 +28,3 @@ export abstract class LandscapeRenderingStrategy { tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void; } - -export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy { - - public onMapLoaded(map: TileMap): void { - let combinedTilesetFactory = new CombinedTilesetFactory(map); - stendhal.data.map.combinedTileset = combinedTilesetFactory.combine(); - } - - public onTilesetLoaded(): void { - let body = document.getElementById("body")!; - body.style.cursor = "auto"; - } - - public render( - canvas: Canvas, gamewindow: any, - tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void { - - let landscapeRenderder = new LandscapeRenderer(); - landscapeRenderder.drawLayer( - canvas, - stendhal.data.map.combinedTileset, - 0, - tileOffsetX, tileOffsetY, targetTileWidth, targetTileHeight); - - gamewindow.drawEntities(); - - landscapeRenderder.drawLayer( - canvas, - stendhal.data.map.combinedTileset, - 1, - tileOffsetX, tileOffsetY, targetTileWidth, targetTileHeight); - } - -} From 1484f872da10a106eb271ce5a2c1e2f264217023 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 25 Jan 2026 19:59:25 +0100 Subject: [PATCH 098/162] code cleanup --- src/js/stendhal/entity/Corpse.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index 786af0113e..1e3ae4a28f 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -40,7 +40,6 @@ export class Corpse extends PopupInventory { if (stendhal.config.getBoolean("activity-indicator")) { this.indicator = new ActivityIndicatorSprite(); } - console.log('XXXX', MarauroaUtils.isEmpty({}), MarauroaUtils.isEmpty({'a': 'b'})); } override set(key: string, value: any) { From 8fc173d9231017e8eaa286c5002461e54514bdde Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 25 Jan 2026 20:01:31 +0100 Subject: [PATCH 099/162] replaced tileset loader "ImagePreloader" as ImageCache using ImageBitmap --- src/js/stendhal/data/ImagePreloader.ts | 174 ------------------ .../IndividualTilesetRenderingStrategy.ts | 47 ++--- src/js/stendhal/sprite/image/ImageCache.ts | 48 +++++ 3 files changed, 74 insertions(+), 195 deletions(-) delete mode 100644 src/js/stendhal/data/ImagePreloader.ts create mode 100644 src/js/stendhal/sprite/image/ImageCache.ts diff --git a/src/js/stendhal/data/ImagePreloader.ts b/src/js/stendhal/data/ImagePreloader.ts deleted file mode 100644 index 87ff9a2852..0000000000 --- a/src/js/stendhal/data/ImagePreloader.ts +++ /dev/null @@ -1,174 +0,0 @@ -/*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - ***************************************************************************/ - -import { stendhal } from "../stendhal"; - - -/* - * Start: http://www.webreference.com/programming/javascript/gr/column3/ - * ( https://web.archive.org/web/20110910064905/http://www.webreference.com:80/programming/javascript/gr/column3/index.html ) - * -function ImagePreloader(images, callback) { - // store the call-back - this.callback = callback; - - // initialize internal state. - this.nLoaded = 0; - this.nProcessed = 0; - stendhal.data.map.aImages = new Array; - - // record the number of images. - this.nImages = images.length; - - // for each image, call preload() - for ( var i = 0; i < images.length; i++) { - this.preload(images[i]); - } -} - -ImagePreloader.prototype.preload = function(image) { - // create new Image object and add to array - var oImage = new Image; - stendhal.data.map.aImages.push(oImage); - - // set up event handlers for the Image object - oImage.onload = ImagePreloader.prototype.onload; - oImage.onerror = ImagePreloader.prototype.onerror; - oImage.onabort = ImagePreloader.prototype.onabort; - - // assign pointer back to this. - oImage.oImagePreloader = this; - oImage.bLoaded = false; - - // assign the .src property of the Image object - oImage.src = image; -}; - -ImagePreloader.prototype.onComplete = function() { - this.nProcessed++; - if (this.nProcessed == this.nImages) { - this.callback(); - } -}; - -ImagePreloader.prototype.onload = function() { - this.bLoaded = true; - this.oImagePreloader.nLoaded++; - this.oImagePreloader.onComplete(); -}; - -ImagePreloader.prototype.onerror = function() { - this.bError = true; - this.oImagePreloader.onComplete(); - console.error("Error loading " + this.src); -}; - -ImagePreloader.prototype.onabort = function() { - this.bAbort = true; - this.oImagePreloader.onComplete(); - console.error("Loading " + this.src + " was aborted"); -}; - * - * End: http://www.webreference.com/programming/javascript/gr/column3/ - */ - - -/** - * preloads images - * - * @param images image url to load - * @param callback callback to invoke - * @constructor - */ -export class ImagePreloader extends Function { - - oImagePreloader: ImagePreloader; - src?: string; - callback: Function; - - // internal state - bLoaded: boolean; - bError: boolean; - bAbort: boolean; - nLoaded: number; - nProcessed: number; - - // number of images - nImages: number; - - - constructor(images: string[], callback: Function) { - super(); - - this.oImagePreloader = {} as ImagePreloader; - // store the call-back - this.callback = callback; - - // initialize internal state. - this.bLoaded = false; - this.bError = false; - this.bAbort = false; - this.nLoaded = 0; - this.nProcessed = 0; - stendhal.data.map.aImages = new Array(); - - // record the number of images. - this.nImages = images.length; - - // for each image, call preload() - for (let i = 0; i < images.length; i++) { - this.preload(images[i]); - } - } - - preload(image: string) { - // create new Image object and add to array - const oImage = new Image() as any; - stendhal.data.map.aImages.push(oImage); - - // set up event handlers for the Image object - oImage.onload = ImagePreloader.prototype.onload; - oImage.onerror = ImagePreloader.prototype.onerror; - oImage.onabort = ImagePreloader.prototype.onabort; - - // assign pointer back to this - oImage.oImagePreloader = this; - oImage.bLoaded = false; - - // assign the .src property of the Image object - oImage.src = image; - } - - onComplete() { - this.nProcessed++; - if (this.nProcessed == this.nImages) { - this.callback(); - } - } - - onload() { - this.bLoaded = true; - this.oImagePreloader.nLoaded++; - this.oImagePreloader.onComplete(); - } - - onerror() { - this.bError = true; - this.oImagePreloader.onComplete(); - console.error("Error loading " + this.src); - } - - onabort() { - this.bAbort = true; - this.oImagePreloader.onComplete(); - console.error("Loading " + this.src + " was aborted"); - } -} diff --git a/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts b/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts index 3868b5d073..8de9384643 100644 --- a/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts +++ b/src/js/stendhal/landscape/IndividualTilesetRenderingStrategy.ts @@ -12,7 +12,7 @@ import { stendhal } from "../stendhal"; import { LandscapeRenderingStrategy } from "./LandscapeRenderingStrategy"; -import { ImagePreloader } from "../data/ImagePreloader"; +import { ImageCache } from "../sprite/image/ImageCache"; import { Chat } from "../util/Chat"; import { TileMap } from "../data/TileMap"; import { Canvas, RenderingContext2D } from "util/Types"; @@ -22,6 +22,8 @@ export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrate private targetTileWidth = 32; private targetTileHeight = 32; + private imageCache = new ImageCache(); + private map!: TileMap; constructor() { super(); @@ -30,16 +32,18 @@ export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrate }, 1000); } - public onMapLoaded(_map: TileMap): void { + public onMapLoaded(map: TileMap): void { // do nothing console.log("Using IndividualTilesetRenderingStrategy.") + this.map = map; + this.imageCache.close(); + this.imageCache = new ImageCache(); + this.imageCache.load(map.tilesetFilenames); } public onTilesetLoaded(): void { - new ImagePreloader(stendhal.data.map.tilesetFilenames, function() { - let body = document.getElementById("body")!; - body.style.cursor = "auto"; - }); + let body = document.getElementById("body")!; + body.style.cursor = "auto"; } public render( @@ -49,8 +53,8 @@ export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrate this.targetTileWidth = targetTileWidth; this.targetTileHeight = targetTileHeight; - for (var drawingLayer=0; drawingLayer < stendhal.data.map.layers.length; drawingLayer++) { - var name = stendhal.data.map.layerNames[drawingLayer]; + for (var drawingLayer=0; drawingLayer < this.map.layers.length; drawingLayer++) { + var name = this.map.layerNames[drawingLayer]; if (name !== "protection" && name !== "collision" && name !== "objects" && name !== "blend_ground" && name !== "blend_roof") { this.paintLayer(canvas, drawingLayer, tileOffsetX, tileOffsetY); @@ -63,25 +67,26 @@ export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrate private paintLayer(canvas: Canvas, drawingLayer: number, tileOffsetX: number, tileOffsetY: number) { - const layer = stendhal.data.map.layers[drawingLayer]; - const yMax = Math.min(tileOffsetY + canvas.height / this.targetTileHeight + 1, stendhal.data.map.zoneSizeY); - const xMax = Math.min(tileOffsetX + canvas.width / this.targetTileWidth + 1, stendhal.data.map.zoneSizeX); + const layer = this.map.layers[drawingLayer]; + const yMax = Math.min(tileOffsetY + canvas.height / this.targetTileHeight + 1, this.map.zoneSizeY); + const xMax = Math.min(tileOffsetX + canvas.width / this.targetTileWidth + 1, this.map.zoneSizeX); let ctx = canvas.getContext("2d")! as RenderingContext2D; for (let y = tileOffsetY; y < yMax; y++) { for (let x = tileOffsetX; x < xMax; x++) { - let gid = layer[y * stendhal.data.map.zoneSizeX + x]; + let gid = layer[y * this.map.zoneSizeX + x]; const flip = gid & 0xE0000000; gid &= 0x1FFFFFFF; if (gid > 0) { - const tileset = stendhal.data.map.getTilesetForGid(gid); - const base = stendhal.data.map.firstgids[tileset]; + const tileset = this.map.getTilesetForGid(gid); + const base = this.map.firstgids[tileset]; const idx = gid - base; try { - if (stendhal.data.map.aImages[tileset].height > 0) { - this.drawTile(ctx, stendhal.data.map.aImages[tileset], idx, x, y, flip); + let image = this.imageCache.images[this.map.tilesetFilenames[tileset]]; + if (image) { + this.drawTile(ctx, image, idx, x, y, flip); } } catch (e) { console.error(e); @@ -91,17 +96,17 @@ export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrate } } - private drawTile(ctx: RenderingContext2D, tileset: HTMLImageElement, idx: number, x: number, y: number, flip = 0) { + private drawTile(ctx: RenderingContext2D, tileset: ImageBitmap, idx: number, x: number, y: number, flip = 0) { const tilesetWidth = tileset.width; - const tilesPerRow = Math.floor(tilesetWidth / stendhal.data.map.tileWidth); + const tilesPerRow = Math.floor(tilesetWidth / this.map.tileWidth); const pixelX = x * this.targetTileWidth; const pixelY = y * this.targetTileHeight; if (flip === 0) { ctx.drawImage(tileset, - (idx % tilesPerRow) * stendhal.data.map.tileWidth, - Math.floor(idx / tilesPerRow) * stendhal.data.map.tileHeight, - stendhal.data.map.tileWidth, stendhal.data.map.tileHeight, + (idx % tilesPerRow) * this.map.tileWidth, + Math.floor(idx / tilesPerRow) * this.map.tileHeight, + this.map.tileWidth, this.map.tileHeight, pixelX, pixelY, this.targetTileWidth, this.targetTileHeight); } else { diff --git a/src/js/stendhal/sprite/image/ImageCache.ts b/src/js/stendhal/sprite/image/ImageCache.ts new file mode 100644 index 0000000000..49e7968566 --- /dev/null +++ b/src/js/stendhal/sprite/image/ImageCache.ts @@ -0,0 +1,48 @@ +/*************************************************************************** + * (C) Copyright 2003-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { stendhal } from "stendhal" + +export class ImageCache { + images: Record = {}; + closed = false; + + load(filenames: string[]) { + for (let filename of filenames) { + this.loadImage(filename); + } + } + + private async loadImage(filename: string) { + let url = filename + "?v=" + stendhal.data.build.version; + let response = await fetch(url); + if (!response.ok || this.closed) { + return; + } + let blob = await response.blob(); + if (this.closed) { + return; + } + let bitmap = await createImageBitmap(blob); + if (this.closed) { + bitmap.close(); + return; + } + this.images[filename] = bitmap; + } + + close() { + this.closed = true; + for (let image of Object.values(this.images)) { + image?.close(); + } + } +} \ No newline at end of file From d24e452f59d3d2796213505961fde5e954c563a6 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 25 Jan 2026 22:46:38 +0100 Subject: [PATCH 100/162] inlined LandscapeRender.ts into CombinedTilesetRenderingStrategy.ts --- .../CombinedTilesetRenderingStrategy.ts | 45 +++++++++++++-- .../stendhal/landscape/LandscapeRenderer.ts | 57 ------------------- .../landscape/LandscapeRenderingStrategy.ts | 1 - 3 files changed, 41 insertions(+), 62 deletions(-) delete mode 100644 src/js/stendhal/landscape/LandscapeRenderer.ts diff --git a/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts b/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts index 25261638ad..071c33262f 100644 --- a/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts +++ b/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts @@ -14,7 +14,7 @@ import { LandscapeRenderingStrategy } from "./LandscapeRenderingStrategy"; import { Canvas } from "util/Types"; import { TileMap } from "../data/TileMap"; import { CombinedTilesetFactory } from "./CombinedTilesetFactory"; -import { LandscapeRenderer } from "./LandscapeRenderer"; +import { CombinedTileset } from "./CombinedTileset"; export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy { @@ -32,8 +32,7 @@ export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy canvas: Canvas, gamewindow: any, tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void { - let landscapeRenderder = new LandscapeRenderer(); - landscapeRenderder.drawLayer( + this.drawLayer( canvas, stendhal.data.map.combinedTileset, 0, @@ -41,11 +40,49 @@ export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy gamewindow.drawEntities(); - landscapeRenderder.drawLayer( + this.drawLayer( canvas, stendhal.data.map.combinedTileset, 1, tileOffsetX, tileOffsetY, targetTileWidth, targetTileHeight); } + drawLayer( + canvas: Canvas, + combinedTileset: CombinedTileset, layerNo: number, + tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void { + if (!combinedTileset) { + return; + } + let ctx = canvas.getContext("2d")!; + + const layer = combinedTileset.combinedLayers[layerNo]; + const yMax = Math.min(tileOffsetY + canvas.height / targetTileHeight + 1, stendhal.data.map.zoneSizeY); + const xMax = Math.min(tileOffsetX + canvas.width / targetTileWidth + 1, stendhal.data.map.zoneSizeX); + + for (let y = tileOffsetY; y < yMax; y++) { + for (let x = tileOffsetX; x < xMax; x++) { + let index = layer[y * stendhal.data.map.zoneSizeX + x]; + if (index > -1) { + + try { + const pixelX = x * targetTileWidth; + const pixelY = y * targetTileHeight; + + ctx.drawImage(combinedTileset.canvas, + + (index % combinedTileset.tilesPerRow) * stendhal.data.map.tileWidth, + Math.floor(index / combinedTileset.tilesPerRow) * stendhal.data.map.tileHeight, + + stendhal.data.map.tileWidth, stendhal.data.map.tileHeight, + pixelX, pixelY, + targetTileWidth, targetTileHeight); + } catch (e) { + console.error(e); + } + } + } + } + } + } diff --git a/src/js/stendhal/landscape/LandscapeRenderer.ts b/src/js/stendhal/landscape/LandscapeRenderer.ts deleted file mode 100644 index cbdcff9ff9..0000000000 --- a/src/js/stendhal/landscape/LandscapeRenderer.ts +++ /dev/null @@ -1,57 +0,0 @@ -/*************************************************************************** - * (C) Copyright 2022-2023 - Faiumoni e. V. * - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - ***************************************************************************/ - -import { Canvas, RenderingContext2D } from "util/Types"; -import { CombinedTileset } from "./CombinedTileset"; - -import { stendhal } from "../stendhal"; - -export class LandscapeRenderer { - - drawLayer( - canvas: Canvas, - combinedTileset: CombinedTileset, layerNo: number, - tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void { - if (!combinedTileset) { - return; - } - let ctx = canvas.getContext("2d")! as RenderingContext2D; - - const layer = combinedTileset.combinedLayers[layerNo]; - const yMax = Math.min(tileOffsetY + canvas.height / targetTileHeight + 1, stendhal.data.map.zoneSizeY); - const xMax = Math.min(tileOffsetX + canvas.width / targetTileWidth + 1, stendhal.data.map.zoneSizeX); - - for (let y = tileOffsetY; y < yMax; y++) { - for (let x = tileOffsetX; x < xMax; x++) { - let index = layer[y * stendhal.data.map.zoneSizeX + x]; - if (index > -1) { - - try { - const pixelX = x * targetTileWidth; - const pixelY = y * targetTileHeight; - - ctx.drawImage(combinedTileset.canvas, - - (index % combinedTileset.tilesPerRow) * stendhal.data.map.tileWidth, - Math.floor(index / combinedTileset.tilesPerRow) * stendhal.data.map.tileHeight, - - stendhal.data.map.tileWidth, stendhal.data.map.tileHeight, - pixelX, pixelY, - targetTileWidth, targetTileHeight); - } catch (e) { - console.error(e); - } - } - } - } - } - -} diff --git a/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts b/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts index 1702419d87..2d6502edbd 100644 --- a/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts +++ b/src/js/stendhal/landscape/LandscapeRenderingStrategy.ts @@ -12,7 +12,6 @@ import { Canvas } from "util/Types"; import { TileMap } from "../data/TileMap"; import { CombinedTilesetFactory } from "./CombinedTilesetFactory"; -import { LandscapeRenderer } from "./LandscapeRenderer"; import { stendhal } from "../stendhal"; From 55e802b988e7c7fe22f7758e70549bc01cc71cbc Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 25 Jan 2026 23:09:08 +0100 Subject: [PATCH 101/162] changed module and moduleResolution for better compatibility --- src/js/stendhal/tsconfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/stendhal/tsconfig.json b/src/js/stendhal/tsconfig.json index 253d705239..df8edfa5e4 100644 --- a/src/js/stendhal/tsconfig.json +++ b/src/js/stendhal/tsconfig.json @@ -2,8 +2,8 @@ "compilerOptions": { "baseUrl": ".", "lib": ["dom", "es2022"], - "module": "node20", - "moduleResolution": "nodenext", + "module": "es2020", + "moduleResolution": "bundler", "noImplicitOverride": true, "outDir": "../../../build/ts", "rootDir": ".", From e0dce1a2423182a09fb1708fd1bd3403ecdfe28c Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 25 Jan 2026 23:33:25 +0100 Subject: [PATCH 102/162] access TileMap directly without referencing stendhal.data.map --- src/js/stendhal/landscape/CombinedTileset.ts | 8 +++---- .../landscape/CombinedTilesetFactory.ts | 2 +- .../CombinedTilesetRenderingStrategy.ts | 24 ++++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/js/stendhal/landscape/CombinedTileset.ts b/src/js/stendhal/landscape/CombinedTileset.ts index fce0f42de1..1689e586fd 100644 --- a/src/js/stendhal/landscape/CombinedTileset.ts +++ b/src/js/stendhal/landscape/CombinedTileset.ts @@ -11,8 +11,6 @@ import { Canvas, RenderingContext2D } from "util/Types"; -import { stendhal } from "../stendhal"; - /** * a combined tileset with group layers using one single tileset image. * @@ -27,14 +25,14 @@ export class CombinedTileset { public readonly ctx: RenderingContext2D; public readonly tilesPerRow: number; - constructor(numberOfTiles: number, public readonly combinedLayers: number[][]) { + constructor(numberOfTiles: number, public readonly combinedLayers: number[][], tileWidth: number, tileHeight: number) { // The original approach used an a very wide image of 32 pixel height. // But both Firefox and Chrome are limit the dimension of an image to 2^15 pixels. this.tilesPerRow = Math.ceil(Math.sqrt(numberOfTiles)); this.canvas = new OffscreenCanvas( - stendhal.data.map.tileWidth * this.tilesPerRow, - stendhal.data.map.tileHeight * this.tilesPerRow); + tileWidth * this.tilesPerRow, + tileHeight * this.tilesPerRow); this.ctx = this.canvas.getContext("2d")!; } diff --git a/src/js/stendhal/landscape/CombinedTilesetFactory.ts b/src/js/stendhal/landscape/CombinedTilesetFactory.ts index 7b27381dc7..9060aa6862 100644 --- a/src/js/stendhal/landscape/CombinedTilesetFactory.ts +++ b/src/js/stendhal/landscape/CombinedTilesetFactory.ts @@ -71,7 +71,7 @@ export class CombinedTilesetFactory { } } } - let combinedTileset = new CombinedTileset(combinedTilesToIndex.size, combinedLayers); + let combinedTileset = new CombinedTileset(combinedTilesToIndex.size, combinedLayers, this.map.tileWidth, this.map.tileHeight); // console.log(this.map, combinedTilesToIndex, combinedLayers); // document.getElementsByTagName("body")[0].append(combinedTileset.canvas); diff --git a/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts b/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts index 071c33262f..7863ca61c6 100644 --- a/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts +++ b/src/js/stendhal/landscape/CombinedTilesetRenderingStrategy.ts @@ -9,7 +9,6 @@ * * ***************************************************************************/ -import { stendhal } from "../stendhal"; import { LandscapeRenderingStrategy } from "./LandscapeRenderingStrategy"; import { Canvas } from "util/Types"; import { TileMap } from "../data/TileMap"; @@ -17,10 +16,13 @@ import { CombinedTilesetFactory } from "./CombinedTilesetFactory"; import { CombinedTileset } from "./CombinedTileset"; export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy { + private combinedTileset?: CombinedTileset; + private map!: TileMap; public onMapLoaded(map: TileMap): void { + this.map = map; let combinedTilesetFactory = new CombinedTilesetFactory(map); - stendhal.data.map.combinedTileset = combinedTilesetFactory.combine(); + this.combinedTileset = combinedTilesetFactory.combine(); } public onTilesetLoaded(): void { @@ -34,7 +36,7 @@ export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy this.drawLayer( canvas, - stendhal.data.map.combinedTileset, + this.combinedTileset, 0, tileOffsetX, tileOffsetY, targetTileWidth, targetTileHeight); @@ -42,14 +44,14 @@ export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy this.drawLayer( canvas, - stendhal.data.map.combinedTileset, + this.combinedTileset, 1, tileOffsetX, tileOffsetY, targetTileWidth, targetTileHeight); } drawLayer( canvas: Canvas, - combinedTileset: CombinedTileset, layerNo: number, + combinedTileset: CombinedTileset|undefined, layerNo: number, tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void { if (!combinedTileset) { return; @@ -57,12 +59,12 @@ export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy let ctx = canvas.getContext("2d")!; const layer = combinedTileset.combinedLayers[layerNo]; - const yMax = Math.min(tileOffsetY + canvas.height / targetTileHeight + 1, stendhal.data.map.zoneSizeY); - const xMax = Math.min(tileOffsetX + canvas.width / targetTileWidth + 1, stendhal.data.map.zoneSizeX); + const yMax = Math.min(tileOffsetY + canvas.height / targetTileHeight + 1, this.map.zoneSizeY); + const xMax = Math.min(tileOffsetX + canvas.width / targetTileWidth + 1, this.map.zoneSizeX); for (let y = tileOffsetY; y < yMax; y++) { for (let x = tileOffsetX; x < xMax; x++) { - let index = layer[y * stendhal.data.map.zoneSizeX + x]; + let index = layer[y * this.map.zoneSizeX + x]; if (index > -1) { try { @@ -71,10 +73,10 @@ export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy ctx.drawImage(combinedTileset.canvas, - (index % combinedTileset.tilesPerRow) * stendhal.data.map.tileWidth, - Math.floor(index / combinedTileset.tilesPerRow) * stendhal.data.map.tileHeight, + (index % combinedTileset.tilesPerRow) * this.map.tileWidth, + Math.floor(index / combinedTileset.tilesPerRow) * this.map.tileHeight, - stendhal.data.map.tileWidth, stendhal.data.map.tileHeight, + this.map.tileWidth, this.map.tileHeight, pixelX, pixelY, targetTileWidth, targetTileHeight); } catch (e) { From a6708ee0c2febf97ad57f0843903dfdda34f60b6 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 25 Jan 2026 23:43:17 +0100 Subject: [PATCH 103/162] removed references to stendhal.data.map and SingletonRepo.getMap() --- src/js/stendhal/Client.ts | 9 ++++--- src/js/stendhal/SingletonRepo.ts | 5 ---- src/js/stendhal/entity/ActiveEntity.ts | 4 ++- src/js/stendhal/entity/Ground.ts | 11 +++++--- src/js/stendhal/entity/Portal.ts | 5 ++-- src/js/stendhal/ui/ViewPort.ts | 20 ++++++++------- .../stendhal/ui/component/MiniMapComponent.ts | 25 +++++++++++-------- 7 files changed, 43 insertions(+), 36 deletions(-) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index 14eaebc62d..7056378639 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -37,6 +37,7 @@ import { SingletonFloatingWindow } from "./ui/toolkit/SingletonFloatingWindow"; import { Chat } from "./util/Chat"; import { DialogHandler } from "./util/DialogHandler"; import { Globals } from "./util/Globals"; +import { TileMap } from "data/TileMap"; /** @@ -117,7 +118,6 @@ export class Client { stendhal.data.group = singletons.getGroupManager(); stendhal.data.outfit = singletons.getOutfitStore(); stendhal.data.sprites = singletons.getSpriteStore(); - stendhal.data.map = singletons.getTileMap(); // online players stendhal.players = []; } @@ -346,7 +346,7 @@ export class Client { this.onDataMap(items[i]["data"]); } } - stendhal.data.map.onTransfer(zoneName, data); + TileMap.get().onTransfer(zoneName, data); }; // update user interface on perceptions @@ -449,6 +449,7 @@ export class Client { * Information about map. */ onDataMap(data: any) { + let map = TileMap.get(); var zoneinfo = {} as {[key: string]: string}; var deserializer = Deserializer.fromBase64(data); deserializer.readAttributes(zoneinfo); @@ -461,8 +462,8 @@ export class Client { // parallax background if (stendhal.config.getBoolean("effect.parallax")) { - stendhal.data.map.setParallax(zoneinfo["parallax"]); - stendhal.data.map.setIgnoredTiles(zoneinfo["parallax_ignore_tiles"]); + map.setParallax(zoneinfo["parallax"]); + map.setIgnoredTiles(zoneinfo["parallax_ignore_tiles"]); } // coloring information diff --git a/src/js/stendhal/SingletonRepo.ts b/src/js/stendhal/SingletonRepo.ts index ffc02e508c..9af8610851 100644 --- a/src/js/stendhal/SingletonRepo.ts +++ b/src/js/stendhal/SingletonRepo.ts @@ -26,7 +26,6 @@ import { CStatus } from "./data/CStatus"; import { CacheManager } from "./data/CacheManager"; import { EmojiStore } from "./data/EmojiStore"; import { GroupManager } from "./data/GroupManager"; -import { TileMap } from "./data/TileMap"; import { OutfitStore } from "./data/OutfitStore"; import { Paths } from "./data/Paths"; import { SpriteStore, store } from "./data/SpriteStore"; @@ -116,10 +115,6 @@ export class SingletonRepo { return LoopedSoundSourceManager.get(); } - static getTileMap(): TileMap { - return TileMap.get(); - } - static getOutfitStore(): OutfitStore { return OutfitStore.get(); } diff --git a/src/js/stendhal/entity/ActiveEntity.ts b/src/js/stendhal/entity/ActiveEntity.ts index e82ac36026..85b6b51521 100644 --- a/src/js/stendhal/entity/ActiveEntity.ts +++ b/src/js/stendhal/entity/ActiveEntity.ts @@ -14,6 +14,7 @@ import { Direction } from "../util/Direction"; import { MathUtil } from "../util/MathUtil"; import { stendhal } from "../stendhal"; +import { TileMap } from "data/TileMap"; export class ActiveEntity extends Entity { @@ -230,9 +231,10 @@ export class ActiveEntity extends Entity { var startY = Math.floor(this["_y"]); var endX = Math.ceil(this["_x"] + this["width"]); var endY = Math.ceil(this["_y"] + this["height"]); + let map = TileMap.get(); for (var y = startY; y < endY; y++) { for (var x = startX; x < endX; x++) { - if (stendhal.data.map.collision(x, y)) { + if (map.collision(x, y)) { return true; } } diff --git a/src/js/stendhal/entity/Ground.ts b/src/js/stendhal/entity/Ground.ts index 3a90bae845..47c7ad9464 100644 --- a/src/js/stendhal/entity/Ground.ts +++ b/src/js/stendhal/entity/Ground.ts @@ -13,6 +13,7 @@ import { Paths } from "../data/Paths"; import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; +import { TileMap } from "data/TileMap"; /** @@ -33,28 +34,30 @@ export class Ground { * @return Direction of the zone to change to, null if no zone change should happen */ private calculateZoneChangeDirection(x: number, y: number): string|null { + let map = TileMap.get(); if (x < 15) { return "4"; // LEFT } - if (x > stendhal.data.map.zoneSizeX * 32 - 15) { + if (x > map.zoneSizeX * 32 - 15) { return "2"; // RIGHT } if (y < 15) { return "1"; // UP } - if (y > stendhal.data.map.zoneSizeY * 32 - 15) { + if (y > map.zoneSizeY * 32 - 15) { return "3"; // DOWN } return null; } getCursor(x: number, y: number): string { - if ((x < 15) || (y < 15) || (x > stendhal.data.map.zoneSizeX * 32 - 15) || (y > stendhal.data.map.zoneSizeY * 32 - 15)) { + let map = TileMap.get(); + if ((x < 15) || (y < 15) || (x > map.zoneSizeX * 32 - 15) || (y > map.zoneSizeY * 32 - 15)) { return "url(" + Paths.sprites + "/cursor/walkborder.png) 1 3, auto" } var worldX = Math.floor(x / 32); var worldY = Math.floor(y / 32); - if (stendhal.data.map.collision(worldX, worldY)) { + if (map.collision(worldX, worldY)) { return "url(" + Paths.sprites + "/cursor/stop.png) 1 3, auto"; } return "url(" + Paths.sprites + "/cursor/walk.png) 1 3, auto"; diff --git a/src/js/stendhal/entity/Portal.ts b/src/js/stendhal/entity/Portal.ts index fa046171ad..de6e562436 100644 --- a/src/js/stendhal/entity/Portal.ts +++ b/src/js/stendhal/entity/Portal.ts @@ -16,7 +16,7 @@ import { Color } from "../data/color/Color"; import { Paths } from "../data/Paths"; import { marauroa } from "marauroa" -import { stendhal } from "../stendhal"; +import { TileMap } from "data/TileMap"; export class Portal extends Entity { @@ -60,7 +60,8 @@ export class Portal extends Entity { */ override getDefaultAction() { // don't try to walk to if on collision tile - if (stendhal.data.map.collision(this["x"], this["y"])) { + let map = TileMap.get(); + if (map.collision(this["x"], this["y"])) { return { "type": "use", "target": "#" + this["id"], diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index 54b0a2627e..7936cea66c 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -33,6 +33,7 @@ import { TextBubble } from "../sprite/TextBubble"; import { Point } from "../util/Point"; import { Canvas, RenderingContext2D } from "util/Types"; import { Debug } from "../util/Debug"; +import { TileMap } from "data/TileMap"; /** @@ -76,6 +77,7 @@ export class ViewPort { private HSLFilter?: string; private colorMethod = ""; private blendMethod = ""; // FIXME: unused + private map: TileMap; /** Styles to be applied when chat panel is not floating. */ private readonly initialStyle: {[prop: string]: string}; @@ -83,7 +85,6 @@ export class ViewPort { /** Singleton instance. */ private static instance: ViewPort; - /** * Retrieves singleton instance. */ @@ -98,6 +99,7 @@ export class ViewPort { * Hidden singleton constructor. */ private constructor() { + this.map = TileMap.get(); const element = this.getElement() as HTMLCanvasElement; this.ctx = element.getContext("2d")!; this.width = element.width; @@ -130,10 +132,10 @@ export class ViewPort { var startTime = new Date().getTime(); if (marauroa.me && document.visibilityState === "visible") { - if (marauroa.currentZoneName === stendhal.data.map.currentZoneName - || stendhal.data.map.currentZoneName === "int_vault" - || stendhal.data.map.currentZoneName === "int_adventure_island" - || stendhal.data.map.currentZoneName === "tutorial_island") { + if (marauroa.currentZoneName === this.map.currentZoneName + || this.map.currentZoneName === "int_vault" + || this.map.currentZoneName === "int_adventure_island" + || this.map.currentZoneName === "tutorial_island") { this.drawingError = false; this.ctx.globalAlpha = 1.0; @@ -146,8 +148,8 @@ export class ViewPort { // FIXME: filter should not be applied to "blend" layers //this.applyFilter(); - stendhal.data.map.parallax.draw(this.ctx, this.offsetX, this.offsetY); - stendhal.data.map.strategy.render(this.ctx.canvas, this, tileOffsetX, tileOffsetY, this.targetTileWidth, this.targetTileHeight); + this.map.parallax.draw(this.ctx, this.offsetX, this.offsetY); + this.map.strategy.render(this.ctx.canvas, this, tileOffsetX, tileOffsetY, this.targetTileWidth, this.targetTileHeight); this.weatherRenderer.draw(this.ctx); //this.removeFilter(); @@ -354,10 +356,10 @@ export class ViewPort { } // Keep the world within the screen view - centerX = Math.min(centerX, stendhal.data.map.zoneSizeX * this.targetTileWidth - canvas.width); + centerX = Math.min(centerX, this.map.zoneSizeX * this.targetTileWidth - canvas.width); centerX = Math.max(centerX, 0); - centerY = Math.min(centerY, stendhal.data.map.zoneSizeY * this.targetTileHeight - canvas.height); + centerY = Math.min(centerY, this.map.zoneSizeY * this.targetTileHeight - canvas.height); centerY = Math.max(centerY, 0); if (this.freeze) { diff --git a/src/js/stendhal/ui/component/MiniMapComponent.ts b/src/js/stendhal/ui/component/MiniMapComponent.ts index 5557eb6a86..9322d2f0e5 100644 --- a/src/js/stendhal/ui/component/MiniMapComponent.ts +++ b/src/js/stendhal/ui/component/MiniMapComponent.ts @@ -18,6 +18,7 @@ import { Player } from "../../entity/Player"; import { Color } from "../../data/color/Color"; import { RenderingContext2D } from "util/Types"; import { stendhal } from "stendhal"; +import { TileMap } from "data/TileMap"; /** @@ -25,6 +26,7 @@ import { stendhal } from "stendhal"; */ export class MiniMapComponent extends Component { + private map: TileMap; private width = 128; private height = 128; private minimumScale = 2; @@ -44,6 +46,7 @@ export class MiniMapComponent extends Component { constructor() { super("minimap"); + this.map = TileMap.get(); this.componentElement.addEventListener("click", (event) => { this.onClick(event); }); @@ -54,8 +57,8 @@ export class MiniMapComponent extends Component { private zoneChange() { - this.mapWidth = stendhal.data.map.zoneSizeX; - this.mapHeight = stendhal.data.map.zoneSizeY; + this.mapWidth = this.map.zoneSizeX; + this.mapHeight = this.map.zoneSizeY; this.scale = Math.max(this.minimumScale, Math.min(this.height / this.mapHeight, this.width / this.mapWidth)); this.createBackgroundImage(); }; @@ -96,10 +99,10 @@ export class MiniMapComponent extends Component { } public draw() { - if (marauroa.currentZoneName === stendhal.data.map.currentZoneName - || stendhal.data.map.currentZoneName === "int_vault" - || stendhal.data.map.currentZoneName === "int_adventure_island" - || stendhal.data.map.currentZoneName === "tutorial_island") { + if (marauroa.currentZoneName === this.map.currentZoneName + || this.map.currentZoneName === "int_vault" + || this.map.currentZoneName === "int_adventure_island" + || this.map.currentZoneName === "tutorial_island") { this.scale = 10; @@ -138,8 +141,8 @@ export class MiniMapComponent extends Component { return; } - if (stendhal.data.map.collisionData !== this.lastZone) { - this.lastZone = stendhal.data.map.collisionData; + if (this.map.collisionData !== this.lastZone) { + this.lastZone = this.map.collisionData; let canvas = new OffscreenCanvas(width, height); let ctx = canvas.getContext("2d")!; let imgData = ctx.createImageData(width, height); @@ -149,10 +152,10 @@ export class MiniMapComponent extends Component { let color = MiniMapComponent.COLOR_GROUND; // RGBA array. Find the actual position let pos = 4 * (y * width + x); - if (stendhal.data.map.collision(x, y)) { + if (this.map.collision(x, y)) { // red collision color = MiniMapComponent.COLOR_COLLISION; - } else if (stendhal.data.map.isProtected(x, y)) { + } else if (this.map.isProtected(x, y)) { // light green for protection color = MiniMapComponent.COLOR_PROTECTION; } @@ -220,7 +223,7 @@ export class MiniMapComponent extends Component { let pos = stendhal.ui.html.extractPosition(event); let x = Math.floor((pos.canvasRelativeX + this.xOffset) / this.scale); let y = Math.floor((pos.canvasRelativeY + this.yOffset) / this.scale); - if (!stendhal.data.map.collision(x, y)) { + if (!this.map.collision(x, y)) { let action: any = { type: "moveto", x: x.toString(), From 72d569343a4ed441aa2f2240128051b3164f5fe2 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 31 Jan 2026 14:55:56 +0100 Subject: [PATCH 104/162] implemented MultilayerImage loader --- src/js/stendhal/sprite/image/ImageMetadata.ts | 16 +++++ .../stendhal/sprite/image/MultilayerImage.ts | 62 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 src/js/stendhal/sprite/image/ImageMetadata.ts create mode 100644 src/js/stendhal/sprite/image/MultilayerImage.ts diff --git a/src/js/stendhal/sprite/image/ImageMetadata.ts b/src/js/stendhal/sprite/image/ImageMetadata.ts new file mode 100644 index 0000000000..fd04ad9500 --- /dev/null +++ b/src/js/stendhal/sprite/image/ImageMetadata.ts @@ -0,0 +1,16 @@ +/*************************************************************************** + * Copyright © 2026-2026 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +export class ImageMetadata { + + constructor(public filename: string, public filter?: string, public color?: number) {} +} \ No newline at end of file diff --git a/src/js/stendhal/sprite/image/MultilayerImage.ts b/src/js/stendhal/sprite/image/MultilayerImage.ts new file mode 100644 index 0000000000..fe5ccec539 --- /dev/null +++ b/src/js/stendhal/sprite/image/MultilayerImage.ts @@ -0,0 +1,62 @@ +/*************************************************************************** + * Copyright © 2024-2026 - Faiumoni e. V. * + *************************************************************************** + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { Canvas } from "util/Types"; +import { ImageMetadata } from "./ImageMetadata"; + +export class MultilayerImage { + private images = new Map(); + private pending: number; + private canvas?: Canvas; + + constructor(private imageMetadatas: ImageMetadata[]) { + this.pending = imageMetadatas.length; + } + + public async load() { + let promises: Promise[] = []; + for (let imageMetadata of this.imageMetadatas) { + promises.push(this.loadImage(imageMetadata)); + } + // TODO: handle empty filenames array (with placeholder image?) + await Promise.all(promises); + return this.canvas; + } + + private async loadImage(imageMetadata: ImageMetadata) { + let response = await fetch(imageMetadata.filename); + if (response.ok) { + let blob = await response.blob(); + let bitmap = await createImageBitmap(blob); + // TODO: filter image + this.images.set(imageMetadata, bitmap); + } + this.pending--; + if (this.pending <= 0) { + this.finish(); + } + } + + private finish() { + // TODO: handle empty image map because all images failed to load; + let first = this.images.values().next().value!; + this.canvas = new OffscreenCanvas(first.width, first.height); + let ctx = this.canvas.getContext("2d")!; + + for (let imageMetadata of this.imageMetadatas) { + let image = this.images.get(imageMetadata)!; + ctx.drawImage(image, 0, 0); + image.close(); + } + } + +} From c19e4b0627975e4fd5ca6391284bae68e506fdb0 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 31 Jan 2026 14:56:11 +0100 Subject: [PATCH 105/162] added filter support to MultilayerImage --- src/js/stendhal/sprite/image/ImageFilter.ts | 15 ++++++++++ .../stendhal/sprite/image/MultilayerImage.ts | 29 ++++++++++++++----- .../ui/component/OutfitPreviewComponent.ts | 8 +++-- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/js/stendhal/sprite/image/ImageFilter.ts b/src/js/stendhal/sprite/image/ImageFilter.ts index 78819e449b..e63a77b368 100644 --- a/src/js/stendhal/sprite/image/ImageFilter.ts +++ b/src/js/stendhal/sprite/image/ImageFilter.ts @@ -9,6 +9,9 @@ * * ***************************************************************************/ +import { ImageWithDimensions } from "data/ImageWithDimensions"; +import { Canvas } from "util/Types"; + export class ImageFilter { // Helper functions /** @@ -182,5 +185,17 @@ export class ImageFilter { console.log("Unknown filter name " + filter); } } + + + public filterImage(image: CanvasImageSource & ImageWithDimensions, filter: string, param?: number): ImageBitmap { + const canvas = new OffscreenCanvas(image.width, image.height); + const ctx = canvas.getContext("2d", {willReadFrequently: true})!; + ctx.drawImage(image, 0, 0); + let imageData = ctx.getImageData(0, 0, image.width, image.height); + new ImageFilter().filter(imageData, filter, param); + this.filter(imageData, filter, param); + ctx.putImageData(imageData, 0, 0); + return canvas.transferToImageBitmap(); + } } diff --git a/src/js/stendhal/sprite/image/MultilayerImage.ts b/src/js/stendhal/sprite/image/MultilayerImage.ts index fe5ccec539..97468488d2 100644 --- a/src/js/stendhal/sprite/image/MultilayerImage.ts +++ b/src/js/stendhal/sprite/image/MultilayerImage.ts @@ -12,12 +12,14 @@ import { Canvas } from "util/Types"; import { ImageMetadata } from "./ImageMetadata"; +import { ImageFilter } from "./ImageFilter"; export class MultilayerImage { private images = new Map(); private pending: number; - private canvas?: Canvas; + private canvas?: OffscreenCanvas; + constructor(private imageMetadatas: ImageMetadata[]) { this.pending = imageMetadatas.length; } @@ -27,9 +29,13 @@ export class MultilayerImage { for (let imageMetadata of this.imageMetadatas) { promises.push(this.loadImage(imageMetadata)); } - // TODO: handle empty filenames array (with placeholder image?) - await Promise.all(promises); - return this.canvas; + + if (promises.length) { + await Promise.all(promises); + } else { + this.finish(); + } + return this.canvas!.transferToImageBitmap(); } private async loadImage(imageMetadata: ImageMetadata) { @@ -37,7 +43,11 @@ export class MultilayerImage { if (response.ok) { let blob = await response.blob(); let bitmap = await createImageBitmap(blob); - // TODO: filter image + if (imageMetadata.filter) { + let filteredBitmap = new ImageFilter().filterImage(bitmap, imageMetadata.filter, imageMetadata.color); + bitmap.close(); + bitmap = filteredBitmap; + } this.images.set(imageMetadata, bitmap); } this.pending--; @@ -47,9 +57,12 @@ export class MultilayerImage { } private finish() { - // TODO: handle empty image map because all images failed to load; - let first = this.images.values().next().value!; - this.canvas = new OffscreenCanvas(first.width, first.height); + let first = undefined; + if (this.images.size) { + first = this.images.values().next().value; + } + // TODO: have a global constant of an empty Canvas and an empty ImageBitmap + this.canvas = new OffscreenCanvas(first?.width || 0, first?.height || 0); let ctx = this.canvas.getContext("2d")!; for (let imageMetadata of this.imageMetadatas) { diff --git a/src/js/stendhal/ui/component/OutfitPreviewComponent.ts b/src/js/stendhal/ui/component/OutfitPreviewComponent.ts index f65514c84a..e71a4bddd6 100644 --- a/src/js/stendhal/ui/component/OutfitPreviewComponent.ts +++ b/src/js/stendhal/ui/component/OutfitPreviewComponent.ts @@ -28,7 +28,7 @@ export class OutfitPreviewComponent extends Component { private dir: Direction; private index: number; - private image?: HTMLImageElement; + private image?: ImageBitmap; private bgColor?: string; @@ -48,7 +48,11 @@ export class OutfitPreviewComponent extends Component { */ setOutfit(outfit: string, coloring?: string) { const otemp = Outfit.build(outfit, coloring); - otemp.toImage((image: HTMLImageElement) => { + otemp.toImage().then((image) => { + if (this.image) { + this.image.close(); + } + // TODO: close on closure of dialog this.image = image; this.update(); }); From 6b1296e059ef2de0f70f120bc438ad3e134d6697 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 31 Jan 2026 15:50:39 +0100 Subject: [PATCH 106/162] renamed MultilayerImage to MultilayerImageLoader --- src/js/stendhal/data/Outfit.ts | 77 +++---------------- ...layerImage.ts => MultilayerImageLoader.ts} | 3 +- 2 files changed, 11 insertions(+), 69 deletions(-) rename src/js/stendhal/sprite/image/{MultilayerImage.ts => MultilayerImageLoader.ts} (97%) diff --git a/src/js/stendhal/data/Outfit.ts b/src/js/stendhal/data/Outfit.ts index 9c02d16de0..9171566a58 100644 --- a/src/js/stendhal/data/Outfit.ts +++ b/src/js/stendhal/data/Outfit.ts @@ -10,13 +10,13 @@ * * ***************************************************************************/ -import { singletons } from "../SingletonRepo"; import { Pair } from "../util/Pair"; import { StringUtil } from "../util/StringUtil"; import { Paths } from "./Paths"; -import { SpriteImage } from "../data/SpriteStore"; import { stendhal } from "../stendhal"; +import { ImageMetadata } from "sprite/image/ImageMetadata"; +import { MultilayerImageLoader } from "sprite/image/MultilayerImageLoader"; /** @@ -195,36 +195,14 @@ export class Outfit { * * TODO: * - use dress layer based on body type - * - * @param {Function} callback - * Function to pass image to when ready. */ - toImage(callback: Function) { - const sig = this.getSignature(); - // get directly from cache since we don't want to return failsafe image - let image: SpriteImage = singletons.getSpriteStore().getCached(sig); - - const onReady = function(e?: Event) { - image.removeEventListener("load", onReady); - callback(image); - }; - - if (image instanceof HTMLImageElement) { - if (image.height > 0) { - onReady(); - } else { - image.addEventListener("load", onReady); - } - return; - } - + async toImage(): Promise { + let parts: ImageMetadata[] = []; let outfitLayers = this.getLayers(); const detailIndex = this.getLayerIndex("detail") || 0; if (stendhal.data.outfit.detailHasRearLayer(detailIndex)) { outfitLayers = [new Pair("detail-rear", detailIndex), ...outfitLayers]; } - - const layers: HTMLImageElement[] = []; for (const l of outfitLayers) { let layerName = l.first; let suffix = ""; @@ -240,49 +218,14 @@ export class Outfit { layerPath += "-nonude"; } layerPath += ".png"; - const coloring = this.getLayerColor(layerName); - if (typeof(coloring) === "undefined") { - layers.push(singletons.getSpriteStore().get(layerPath)); - } else { - layers.push(singletons.getSpriteStore().getFiltered(layerPath, "trueColor", coloring)); + let filter = undefined; + let coloring = this.getLayerColor(layerName); + if (coloring) { + filter = "trueColor"; } + parts.push(new ImageMetadata(layerPath, filter, coloring)); } - if (layers.length == 0) { - image = singletons.getSpriteStore().getFailsafe() as SpriteImage; - callback(image); - return; - } - - let onAllLayersReady: Function; - const onLayerReady = function(e?: Event) { - for (const layer of layers) { - if (!layer.complete || layer.height === 0) { - return; - } - } - onAllLayersReady(); - }; - - onAllLayersReady = function() { - let canvas = new OffscreenCanvas(48 * 3, 64 * 4); - let ctx = canvas.getContext("2d")!; - for (const layer of layers) { - layer.removeEventListener("load", onLayerReady); - ctx.drawImage(layer, 0, 0); - } - image = canvas as unknown as SpriteImage; // TODO clean this up - image.counter = 1; - singletons.getSpriteStore().cache(sig, image); - onReady(); - }; - - for (const layer of layers) { - if (layer.height > 0) { - onLayerReady(); - } else { - layer.addEventListener("load", onLayerReady); - } - } + return await new MultilayerImageLoader(parts).load(); } } diff --git a/src/js/stendhal/sprite/image/MultilayerImage.ts b/src/js/stendhal/sprite/image/MultilayerImageLoader.ts similarity index 97% rename from src/js/stendhal/sprite/image/MultilayerImage.ts rename to src/js/stendhal/sprite/image/MultilayerImageLoader.ts index 97468488d2..03c92f86aa 100644 --- a/src/js/stendhal/sprite/image/MultilayerImage.ts +++ b/src/js/stendhal/sprite/image/MultilayerImageLoader.ts @@ -10,11 +10,10 @@ * * ***************************************************************************/ -import { Canvas } from "util/Types"; import { ImageMetadata } from "./ImageMetadata"; import { ImageFilter } from "./ImageFilter"; -export class MultilayerImage { +export class MultilayerImageLoader { private images = new Map(); private pending: number; private canvas?: OffscreenCanvas; From 3534bf384f758bfe082366fc0d1fa62946917b2b Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 31 Jan 2026 17:06:49 +0100 Subject: [PATCH 107/162] close outfit dialog preview ImageBitmap --- src/js/stendhal/ui/component/OutfitPreviewComponent.ts | 9 +++++---- src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/js/stendhal/ui/component/OutfitPreviewComponent.ts b/src/js/stendhal/ui/component/OutfitPreviewComponent.ts index e71a4bddd6..9fc10a3892 100644 --- a/src/js/stendhal/ui/component/OutfitPreviewComponent.ts +++ b/src/js/stendhal/ui/component/OutfitPreviewComponent.ts @@ -49,10 +49,7 @@ export class OutfitPreviewComponent extends Component { setOutfit(outfit: string, coloring?: string) { const otemp = Outfit.build(outfit, coloring); otemp.toImage().then((image) => { - if (this.image) { - this.image.close(); - } - // TODO: close on closure of dialog + this.image?.close(); this.image = image; this.update(); }); @@ -142,4 +139,8 @@ export class OutfitPreviewComponent extends Component { } ctx.drawImage(this.image, this.index * w, (this.dir.val - 1) * h, w, h, 0, 0, w, h); } + + close() { + this.image?.close(); + } } diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts index c35cc820fd..5a267570d6 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2007-2024 - Faiumoni e. V. * + * (C) Copyright 2007-2026 - Faiumoni e. V. * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -246,7 +246,7 @@ export class OutfitDialog extends DialogContentComponent { } public override onParentClose() { + this.outfitPreview.close(); ui.unregisterComponent(this); } - } From 61f047a95512d01cee0f9acadfe79f47d8a5248a Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 31 Jan 2026 17:18:58 +0100 Subject: [PATCH 108/162] prevent negative positions of dialogs --- src/js/stendhal/util/ConfigManager.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/js/stendhal/util/ConfigManager.ts b/src/js/stendhal/util/ConfigManager.ts index 2e7c76fa9b..61b615fcff 100644 --- a/src/js/stendhal/util/ConfigManager.ts +++ b/src/js/stendhal/util/ConfigManager.ts @@ -198,8 +198,6 @@ export class ConfigManager { "Carlito": "" }; - /** Cached window states. */ - private readonly windowstates: {[id: string]: Point} = {}; /** @deprecated */ private initialized = false; @@ -457,7 +455,6 @@ export class ConfigManager { * Vertical position. */ setWindowState(id: string, x: number, y: number) { - this.windowstates[id] = new Point(x, y); this.set("window." + id, x + "," + y); } @@ -470,12 +467,11 @@ export class ConfigManager { * Point containing X/Y positioning of window. */ getWindowState(id: string): Point { - if (!this.windowstates.hasOwnProperty(id)) { - const tmp: string[] = (this.get("window." + id) || "0,0").split(","); - // cache state - this.windowstates[id] = new Point(parseInt(tmp[0], 10), parseInt(tmp[1], 10)); - } - return this.windowstates[id]; + let val = this.get("window." + id) || "0,0"; + let tmp: string[] = val.split(","); + let x = parseInt(tmp[0]); + let y = parseInt(tmp[1]); + return new Point(x >= 0 ? x : 0, y >= 0 ? y : 0); } /** From 5f4d9d9460460af54af306c84267b15479d63bd9 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 31 Jan 2026 21:28:43 +0100 Subject: [PATCH 109/162] moved SpriteStore.getAreaOf() to HTMLImageElementUtil --- src/js/stendhal/data/SpriteStore.ts | 45 --------------- src/js/stendhal/sprite/NotificationBubble.ts | 3 +- .../sprite/image/HTMLImageElementUtil.ts | 57 +++++++++++++++++++ src/js/stendhal/ui/ViewPort.ts | 3 +- .../component/ItemContainerImplementation.ts | 3 +- 5 files changed, 63 insertions(+), 48 deletions(-) create mode 100644 src/js/stendhal/sprite/image/HTMLImageElementUtil.ts diff --git a/src/js/stendhal/data/SpriteStore.ts b/src/js/stendhal/data/SpriteStore.ts index 8cc39b72c8..c7b35f270e 100644 --- a/src/js/stendhal/data/SpriteStore.ts +++ b/src/js/stendhal/data/SpriteStore.ts @@ -228,8 +228,6 @@ export class SpriteStore { failsafe.counter++; } else { failsafe = new Image() as SpriteImage; - // TypeError: Image constructor: 'new' is required - //~ failsafe = new SpriteImage(); failsafe.counter = 0; failsafe.src = filename; this.images[filename] = failsafe; @@ -264,49 +262,6 @@ export class SpriteStore { } } - /** - * Get an image element whose image data is an area of a specified image. - * If the area matches the original image, the image itself is returned. - * Otherwise a copy of the image data is returned. This is meant - * to be used for obtaining the drag image for drag and drop. - * - * @param image original image - * @param width width of the area - * @param height height of the area - * @param {number=} offsetX optional. left x coordinate of the area - * @param {number=} offsetY optional. top y coordinate of the area - */ - getAreaOf(image: HTMLImageElement, width: number, height: number, - offsetX?: number, offsetY?: number): any { - try { - offsetX = offsetX || 0; - offsetY = offsetY || 0; - if ((image.width === width) && (image.height === height) - && (offsetX === 0) && (offsetY === 0)) { - return image; - } - var canvas = document.createElement("canvas") as HTMLCanvasElement; - canvas.width = width; - canvas.height = height; - var ctx = canvas.getContext("2d")!; - ctx.drawImage(image, offsetX, offsetY, width, height, 0, 0, width, height); - // Firefox would be able to use the canvas directly as a drag image, but - // Chrome does not. This should work in any standards compliant browser. - // TODO: Check if that is still true - var newImage = new Image(); - newImage.src = canvas.toDataURL("image/png"); - return newImage; - } catch (err) { - if (err instanceof DOMException) { - return this.getFailsafe(); - } else { - // don't ignore other errors - throw err; - } - } - - return {}; - } /** * @param {string} fileName diff --git a/src/js/stendhal/sprite/NotificationBubble.ts b/src/js/stendhal/sprite/NotificationBubble.ts index 6232b3f492..61d13c1738 100644 --- a/src/js/stendhal/sprite/NotificationBubble.ts +++ b/src/js/stendhal/sprite/NotificationBubble.ts @@ -21,6 +21,7 @@ import { Speech } from "../util/Speech"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; +import { HTMLImageElementUtil } from "./image/HTMLImageElementUtil"; export class NotificationBubble extends TextBubble { @@ -138,7 +139,7 @@ export class NotificationBubble extends TextBubble { const img = singletons.getSpriteStore().get(Paths.sprites + "/npc/" + this.profileName + ".png"); if (img.complete && img.height) { - this.profile = singletons.getSpriteStore().getAreaOf(img, 48, 48, 48, 128); + this.profile = HTMLImageElementUtil.getAreaOf(img, 48, 48, 48, 128); } } } diff --git a/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts b/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts new file mode 100644 index 0000000000..134e2f835e --- /dev/null +++ b/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts @@ -0,0 +1,57 @@ +/*************************************************************************** + * (C) Copyright 2003-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { store } from "../../data/SpriteStore"; + +export class HTMLImageElementUtil { + + /** + * Get an image element whose image data is an area of a specified image. + * If the area matches the original image, the image itself is returned. + * Otherwise a copy of the image data is returned. This is meant + * to be used for obtaining the drag image for drag and drop. + * + * @param image original image + * @param width width of the area + * @param height height of the area + * @param {number=} offsetX optional. left x coordinate of the area + * @param {number=} offsetY optional. top y coordinate of the area + */ + static getAreaOf(image: HTMLImageElement, width: number, height: number, + offsetX?: number, offsetY?: number): any { + try { + offsetX = offsetX || 0; + offsetY = offsetY || 0; + if ((image.width === width) && (image.height === height) + && (offsetX === 0) && (offsetY === 0)) { + return image; + } + var canvas = document.createElement("canvas") as HTMLCanvasElement; + canvas.width = width; + canvas.height = height; + var ctx = canvas.getContext("2d")!; + ctx.drawImage(image, offsetX, offsetY, width, height, 0, 0, width, height); + // Firefox would be able to use the canvas directly as a drag image, but + // Chrome does not. This should work in any standards compliant browser. + // TODO: Check if that is still true + var newImage = new Image(); + newImage.src = canvas.toDataURL("image/png"); + return newImage; + } catch (err) { + if (err instanceof DOMException) { + return store.getFailsafe(); + } else { + // don't ignore other errors + throw err; + } + } + } +} diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index 7936cea66c..8cc35ad638 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -34,6 +34,7 @@ import { Point } from "../util/Point"; import { Canvas, RenderingContext2D } from "util/Types"; import { Debug } from "../util/Debug"; import { TileMap } from "data/TileMap"; +import { HTMLImageElementUtil } from "sprite/image/HTMLImageElementUtil"; /** @@ -656,7 +657,7 @@ export class ViewPort { var img = undefined; let heldObject: HeldObject; if (draggedEntity && draggedEntity.type === "item") { - img = singletons.getSpriteStore().getAreaOf(singletons.getSpriteStore().get(draggedEntity.sprite.filename), 32, 32); + img = HTMLImageElementUtil.getAreaOf(singletons.getSpriteStore().get(draggedEntity.sprite.filename), 32, 32); heldObject = { path: draggedEntity.getIdPath(), zone: marauroa.currentZoneName, diff --git a/src/js/stendhal/ui/component/ItemContainerImplementation.ts b/src/js/stendhal/ui/component/ItemContainerImplementation.ts index ed07422c65..39bf4b0044 100644 --- a/src/js/stendhal/ui/component/ItemContainerImplementation.ts +++ b/src/js/stendhal/ui/component/ItemContainerImplementation.ts @@ -22,6 +22,7 @@ import { singletons } from "../../SingletonRepo"; import { Point } from "../../util/Point"; import { Paths } from "../../data/Paths"; +import { HTMLImageElementUtil } from "sprite/image/HTMLImageElementUtil"; /** @@ -191,7 +192,7 @@ export class ItemContainerImplementation { quantity: item.hasOwnProperty("quantity") ? item["quantity"] : 1 }; - const img = singletons.getSpriteStore().getAreaOf(singletons.getSpriteStore().get(item.sprite.filename), 32, 32); + const img = HTMLImageElementUtil.getAreaOf(singletons.getSpriteStore().get(item.sprite.filename), 32, 32); if (event instanceof DragEvent && event.dataTransfer) { stendhal.ui.heldObject = heldObject; event.dataTransfer.setDragImage(img, 0, 0); From f109b551f5ea25cf0cf9ea08fca06cb824089cc4 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 31 Jan 2026 23:10:42 +0100 Subject: [PATCH 110/162] optimized image creation --- .../sprite/image/HTMLImageElementUtil.ts | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts b/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts index 134e2f835e..e8d492de20 100644 --- a/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts +++ b/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { ImageWithDimensions } from "data/ImageWithDimensions"; import { store } from "../../data/SpriteStore"; export class HTMLImageElementUtil { @@ -19,39 +20,37 @@ export class HTMLImageElementUtil { * Otherwise a copy of the image data is returned. This is meant * to be used for obtaining the drag image for drag and drop. * + * This method intentionally returns an HTMLImageElement because Chrome is + * not able to use an HTMLCanvasElement as drag image. Firefox does support + * this. But neither browser is able to use an ImageBitmap. + * * @param image original image * @param width width of the area * @param height height of the area * @param {number=} offsetX optional. left x coordinate of the area * @param {number=} offsetY optional. top y coordinate of the area */ - static getAreaOf(image: HTMLImageElement, width: number, height: number, + static getAreaOf(image: CanvasImageSource & ImageWithDimensions, width: number, height: number, offsetX?: number, offsetY?: number): any { - try { - offsetX = offsetX || 0; - offsetY = offsetY || 0; - if ((image.width === width) && (image.height === height) - && (offsetX === 0) && (offsetY === 0)) { - return image; - } - var canvas = document.createElement("canvas") as HTMLCanvasElement; - canvas.width = width; - canvas.height = height; - var ctx = canvas.getContext("2d")!; - ctx.drawImage(image, offsetX, offsetY, width, height, 0, 0, width, height); - // Firefox would be able to use the canvas directly as a drag image, but - // Chrome does not. This should work in any standards compliant browser. - // TODO: Check if that is still true - var newImage = new Image(); - newImage.src = canvas.toDataURL("image/png"); - return newImage; - } catch (err) { - if (err instanceof DOMException) { - return store.getFailsafe(); - } else { - // don't ignore other errors - throw err; - } + + offsetX = offsetX || 0; + offsetY = offsetY || 0; + if (image instanceof HTMLImageElement + && (image.width === width) && (image.height === height) + && (offsetX === 0) && (offsetY === 0)) { + return image; } + let canvas = document.createElement("canvas") as HTMLCanvasElement; + canvas.width = width; + canvas.height = height; + let ctx = canvas.getContext("2d", {willReadFrequently: true})!; + try { + ctx.drawImage(image, offsetX, offsetY, width, height, 0, 0, width, height); + } catch (err) { + ctx.drawImage(store.getFailsafe(), 0, 0); + } + let newImage = new Image(); + newImage.src = canvas.toDataURL("image/png"); + return newImage; } } From e58e6a54cb9fbfbd5136604d3a3160a997adc88e Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 31 Jan 2026 23:11:37 +0100 Subject: [PATCH 111/162] do not use failsave sprite for drag image --- src/js/stendhal/sprite/image/HTMLImageElementUtil.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts b/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts index e8d492de20..96500d3dbf 100644 --- a/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts +++ b/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts @@ -27,8 +27,8 @@ export class HTMLImageElementUtil { * @param image original image * @param width width of the area * @param height height of the area - * @param {number=} offsetX optional. left x coordinate of the area - * @param {number=} offsetY optional. top y coordinate of the area + * @param offsetX optional. left x coordinate of the area + * @param offsetY optional. top y coordinate of the area */ static getAreaOf(image: CanvasImageSource & ImageWithDimensions, width: number, height: number, offsetX?: number, offsetY?: number): any { @@ -47,7 +47,7 @@ export class HTMLImageElementUtil { try { ctx.drawImage(image, offsetX, offsetY, width, height, 0, 0, width, height); } catch (err) { - ctx.drawImage(store.getFailsafe(), 0, 0); + console.log(err); } let newImage = new Image(); newImage.src = canvas.toDataURL("image/png"); From 95f373bd1c6d209b6f6bea719c84cee755746e6e Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 1 Feb 2026 22:25:06 +0100 Subject: [PATCH 112/162] removed reference to global stendhal object --- src/js/stendhal/data/SpriteStore.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/js/stendhal/data/SpriteStore.ts b/src/js/stendhal/data/SpriteStore.ts index c7b35f270e..408f4ae139 100644 --- a/src/js/stendhal/data/SpriteStore.ts +++ b/src/js/stendhal/data/SpriteStore.ts @@ -9,8 +9,6 @@ * * ***************************************************************************/ -import { stendhal } from "../stendhal"; - import { Paths } from "./Paths"; import { ImageFilter } from "../sprite/image/ImageFilter"; @@ -298,12 +296,12 @@ export class SpriteStore { */ getFilteredWithPromise(fileName: string, filter: string, param?: number) { const imgPromise = this.getWithPromise(fileName); - return imgPromise.then(function (img: HTMLImageElement) { + return imgPromise.then((img: HTMLImageElement) => { if (!img.complete || img.width === 0 || img.height === 0) { return img; } const filteredName = fileName + " " + filter + " " + param; - let filtered: SpriteImage = stendhal.data.sprites.images[filteredName]; + let filtered: SpriteImage = this.images[filteredName]; if (typeof(filtered) === "undefined") { const canvas = document.createElement("canvas") as any; canvas.width = img.width; @@ -314,7 +312,7 @@ export class SpriteStore { new ImageFilter().filter(imgData, filter, param); ctx.putImageData(imgData, 0, 0); canvas.complete = true; - stendhal.data.sprites.images[filteredName] = filtered = canvas as SpriteImage; + this.images[filteredName] = filtered = canvas as SpriteImage; } return filtered; From afb06b8f97c6af55b9a37a562277886666c19ea0 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 1 Feb 2026 22:25:24 +0100 Subject: [PATCH 113/162] started to work on ImageManager and ImageRef --- src/js/stendhal/sprite/image/ImageManager.ts | 38 +++++++++++ src/js/stendhal/sprite/image/ImageRef.ts | 72 ++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 src/js/stendhal/sprite/image/ImageManager.ts create mode 100644 src/js/stendhal/sprite/image/ImageRef.ts diff --git a/src/js/stendhal/sprite/image/ImageManager.ts b/src/js/stendhal/sprite/image/ImageManager.ts new file mode 100644 index 0000000000..e66a350943 --- /dev/null +++ b/src/js/stendhal/sprite/image/ImageManager.ts @@ -0,0 +1,38 @@ +/*************************************************************************** + * (C) Copyright 2003-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { ImageRef } from "./ImageRef"; + +export class ImageManager { + + images = new Map(); + + load(filename: string) { + let imageRef = this.images.get(filename); + if (!imageRef) { + imageRef = new ImageRef(filename); + } + imageRef.use(); + return imageRef; + } + + free(filename: string) { + let imageRef = this.images.get(filename); + if (!imageRef) { + console.error("freeing unknown image: " + filename); + return; + } + imageRef.free(); + } + +} + +export const images = /* @__PURE__ */ new ImageManager(); diff --git a/src/js/stendhal/sprite/image/ImageRef.ts b/src/js/stendhal/sprite/image/ImageRef.ts new file mode 100644 index 0000000000..91051312f8 --- /dev/null +++ b/src/js/stendhal/sprite/image/ImageRef.ts @@ -0,0 +1,72 @@ +/*************************************************************************** + * (C) Copyright 2003-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { stendhal } from "stendhal"; + +export class ImageRef { + image?: ImageBitmap; + refCount = 0; + lastFreed?: Date; + closed = false; + + constructor(private filename: string) { + // empty + } + + async load() { + let url = this.filename + "?v=" + stendhal.data.build.version; + let response = await fetch(url); + if (!response.ok || this.closed) { + return; + } + let blob = await response.blob(); + if (this.closed) { + return; + } + let bitmap = await createImageBitmap(blob); + if (this.closed) { + bitmap.close(); + return; + } + this.image = bitmap; + } + + /** + * called internally by ImageManager + */ + use() { + this.refCount++; + this.lastFreed = undefined; + } + + /** + * called internally by ImageManager + */ + free() { + this.refCount--; + if (this.refCount < 0) { + console.error("Negative reference count", this); + } + if (this.refCount <= 0) { + this.lastFreed = new Date(); + } + } + + /** + * called internally by ImageManager + */ + close() { + this.closed = true; + this.image?.close(); + this.image = undefined; + } + +} From 2bd16f03078998868e2ceb3bf2ab27fe7e3dedbe Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 1 Feb 2026 22:43:01 +0100 Subject: [PATCH 114/162] implemented ImageRef.waitFor() --- src/js/stendhal/sprite/image/ImageManager.ts | 1 + src/js/stendhal/sprite/image/ImageRef.ts | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/js/stendhal/sprite/image/ImageManager.ts b/src/js/stendhal/sprite/image/ImageManager.ts index e66a350943..0e7bbffdd7 100644 --- a/src/js/stendhal/sprite/image/ImageManager.ts +++ b/src/js/stendhal/sprite/image/ImageManager.ts @@ -21,6 +21,7 @@ export class ImageManager { imageRef = new ImageRef(filename); } imageRef.use(); + imageRef.load(); return imageRef; } diff --git a/src/js/stendhal/sprite/image/ImageRef.ts b/src/js/stendhal/sprite/image/ImageRef.ts index 91051312f8..7e42186af9 100644 --- a/src/js/stendhal/sprite/image/ImageRef.ts +++ b/src/js/stendhal/sprite/image/ImageRef.ts @@ -13,12 +13,16 @@ import { stendhal } from "stendhal"; export class ImageRef { image?: ImageBitmap; - refCount = 0; - lastFreed?: Date; - closed = false; + private refCount = 0; + private lastFreed?: Date; + private closed = false; + private loaded: Promise; + private promiseResolve!: Function; constructor(private filename: string) { - // empty + this.loaded = new Promise((resolve) => { + this.promiseResolve = resolve; + }) } async load() { @@ -37,6 +41,7 @@ export class ImageRef { return; } this.image = bitmap; + this.promiseResolve(bitmap); } /** @@ -69,4 +74,7 @@ export class ImageRef { this.image = undefined; } + async waitFor(): Promise { + return this.loaded + } } From 7e0fbe0f168ff0d483c9e6ce6d17fe4eb16abe80 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 2 Feb 2026 20:54:03 +0100 Subject: [PATCH 115/162] split ImageRef and ImageRefImpl to hide management methods --- src/js/stendhal/sprite/image/ImageManager.ts | 11 ++- src/js/stendhal/sprite/image/ImageRef.ts | 68 +--------------- src/js/stendhal/sprite/image/ImageRefImpl.ts | 81 ++++++++++++++++++++ 3 files changed, 91 insertions(+), 69 deletions(-) create mode 100644 src/js/stendhal/sprite/image/ImageRefImpl.ts diff --git a/src/js/stendhal/sprite/image/ImageManager.ts b/src/js/stendhal/sprite/image/ImageManager.ts index 0e7bbffdd7..751ccdfa11 100644 --- a/src/js/stendhal/sprite/image/ImageManager.ts +++ b/src/js/stendhal/sprite/image/ImageManager.ts @@ -10,18 +10,19 @@ ***************************************************************************/ import { ImageRef } from "./ImageRef"; +import { ImageRefImpl } from "./ImageRefImpl"; export class ImageManager { - images = new Map(); + images = new Map(); - load(filename: string) { + load(filename: string): ImageRef { let imageRef = this.images.get(filename); if (!imageRef) { - imageRef = new ImageRef(filename); + imageRef = new ImageRefImpl(filename); + imageRef.load(); } imageRef.use(); - imageRef.load(); return imageRef; } @@ -34,6 +35,8 @@ export class ImageManager { imageRef.free(); } + // TODO: consider providing a new method: free(imageRef: ImageRef) + } export const images = /* @__PURE__ */ new ImageManager(); diff --git a/src/js/stendhal/sprite/image/ImageRef.ts b/src/js/stendhal/sprite/image/ImageRef.ts index 7e42186af9..9e7402f0dd 100644 --- a/src/js/stendhal/sprite/image/ImageRef.ts +++ b/src/js/stendhal/sprite/image/ImageRef.ts @@ -9,72 +9,10 @@ * * ***************************************************************************/ -import { stendhal } from "stendhal"; - -export class ImageRef { +export abstract class ImageRef { image?: ImageBitmap; - private refCount = 0; - private lastFreed?: Date; - private closed = false; - private loaded: Promise; - private promiseResolve!: Function; - constructor(private filename: string) { - this.loaded = new Promise((resolve) => { - this.promiseResolve = resolve; - }) - } - - async load() { - let url = this.filename + "?v=" + stendhal.data.build.version; - let response = await fetch(url); - if (!response.ok || this.closed) { - return; - } - let blob = await response.blob(); - if (this.closed) { - return; - } - let bitmap = await createImageBitmap(blob); - if (this.closed) { - bitmap.close(); - return; - } - this.image = bitmap; - this.promiseResolve(bitmap); - } - - /** - * called internally by ImageManager - */ - use() { - this.refCount++; - this.lastFreed = undefined; - } - - /** - * called internally by ImageManager - */ - free() { - this.refCount--; - if (this.refCount < 0) { - console.error("Negative reference count", this); - } - if (this.refCount <= 0) { - this.lastFreed = new Date(); - } - } - - /** - * called internally by ImageManager - */ - close() { - this.closed = true; - this.image?.close(); - this.image = undefined; - } - - async waitFor(): Promise { - return this.loaded + async /*abstract */ waitFor(): Promise { + return new Promise(() => {}); } } diff --git a/src/js/stendhal/sprite/image/ImageRefImpl.ts b/src/js/stendhal/sprite/image/ImageRefImpl.ts new file mode 100644 index 0000000000..86d7411a39 --- /dev/null +++ b/src/js/stendhal/sprite/image/ImageRefImpl.ts @@ -0,0 +1,81 @@ +/*************************************************************************** + * (C) Copyright 2003-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { stendhal } from "stendhal"; +import { ImageRef } from "./ImageRef"; + +export class ImageRefImpl extends ImageRef { + private refCount = 0; + private lastFreed?: Date; + private closed = false; + private loaded: Promise; + private promiseResolve!: Function; + + constructor(private filename: string) { + super(); + this.loaded = new Promise((resolve) => { + this.promiseResolve = resolve; + }) + } + + async load() { + let url = this.filename + "?v=" + stendhal.data.build.version; + let response = await fetch(url); + if (!response.ok || this.closed) { + return; + } + let blob = await response.blob(); + if (this.closed) { + return; + } + let bitmap = await createImageBitmap(blob); + if (this.closed) { + bitmap.close(); + return; + } + this.image = bitmap; + this.promiseResolve(bitmap); + } + + /** + * called internally by ImageManager + */ + use() { + this.refCount++; + this.lastFreed = undefined; + } + + /** + * called internally by ImageManager + */ + free() { + this.refCount--; + if (this.refCount < 0) { + console.error("Negative reference count", this); + } + if (this.refCount <= 0) { + this.lastFreed = new Date(); + } + } + + /** + * called internally by ImageManager + */ + close() { + this.closed = true; + this.image?.close(); + this.image = undefined; + } + + override async waitFor(): Promise { + return this.loaded + } +} From 41604ca00e6e077ac55a2f2b54e69664cd34c74e Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 2 Feb 2026 21:59:34 +0100 Subject: [PATCH 116/162] code cleanup --- src/js/stendhal/sprite/image/ImageFilter.ts | 78 ++++++++++----------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/src/js/stendhal/sprite/image/ImageFilter.ts b/src/js/stendhal/sprite/image/ImageFilter.ts index e63a77b368..d23a3acb1f 100644 --- a/src/js/stendhal/sprite/image/ImageFilter.ts +++ b/src/js/stendhal/sprite/image/ImageFilter.ts @@ -10,19 +10,17 @@ ***************************************************************************/ import { ImageWithDimensions } from "data/ImageWithDimensions"; -import { Canvas } from "util/Types"; export class ImageFilter { - // Helper functions + /** - * @param {Number} rgb - * @return {Array} + * @param rgb */ splitrgb(rgb: number): number[] { rgb &= 0xffffff; - var b = rgb & 0xff; + let b = rgb & 0xff; rgb >>>= 8; - var g = rgb & 0xff; + let g = rgb & 0xff; rgb >>>= 8; return [rgb, g, b]; } @@ -34,15 +32,14 @@ export class ImageFilter { } /** - * @param {Array} rgb - * @return {Array} + * @param rgb */ rgb2hsl(rgb: number[]): number[] { - var r = rgb[0] / 255; - var g = rgb[1] / 255; - var b = rgb[2] / 255; + let r = rgb[0] / 255; + let g = rgb[1] / 255; + let b = rgb[2] / 255; - var max, min, maxVar; + let max, min, maxVar; // Find the max and minimum colors, and remember which one it was if (r > g) { max = r; @@ -61,11 +58,11 @@ export class ImageFilter { } // lightness - var l = (max + min) / 2; - var s, h; + let l = (max + min) / 2; + let s, h; // saturation - var diff = max - min; + let diff = max - min; if (diff < 0.000001) { s = 0; // hue not really defined, but set it to something reasonable @@ -97,15 +94,15 @@ export class ImageFilter { * @return {Array} */ hsl2rgb(hsl: number[]): number[] { - var r, g, b; - var h = hsl[0]; - var s = hsl[1]; - var l = hsl[2]; + let r, g, b; + let h = hsl[0]; + let s = hsl[1]; + let l = hsl[2]; if (s < 0.0000001) { r = g = b = Math.floor(255 * l); } else { - var tmp1, tmp2; + let tmp1, tmp2; if (l < 0.5) { tmp1 = l * (1 + s); } else { @@ -113,9 +110,9 @@ export class ImageFilter { } tmp2 = 2 * l - tmp1; - var rf = this.hue2rgb(this.limitHue(h + 1 / 3), tmp2, tmp1); - var gf = this.hue2rgb(this.limitHue(h), tmp2, tmp1); - var bf = this.hue2rgb(this.limitHue(h - 1 / 3), tmp2, tmp1); + let rf = this.hue2rgb(this.limitHue(h + 1 / 3), tmp2, tmp1); + let gf = this.hue2rgb(this.limitHue(h), tmp2, tmp1); + let bf = this.hue2rgb(this.limitHue(h - 1 / 3), tmp2, tmp1); r = Math.floor(255 * rf) & 0xff; g = Math.floor(255 * gf) & 0xff; @@ -126,12 +123,12 @@ export class ImageFilter { } /** - * @param {Number} hue - * @param {Number} val1 - * @param {Number} val2 + * @param hue + * @param val1 + * @param val2 */ private hue2rgb(hue: number, val1: number, val2: number): number { - var res = hue; + let res = hue; if (6 * hue < 1) { res = val1 + (val2 - val1) * 6 * hue; } else if (2 * hue < 1) { @@ -146,10 +143,10 @@ export class ImageFilter { } /** - * @param {Number} hue + * @param hue */ private limitHue(hue: number): number { - var res = hue; + let res = hue; if (res < 0) { res += 1; } else if (res > 1) { @@ -159,25 +156,26 @@ export class ImageFilter { } private trueColor(data: any, color: number) { - var hslColor = this.rgb2hsl(this.splitrgb(color)); - var end = data.length; - for (var i = 0; i < end; i += 4) { - var rgb = [data[i], data[i + 1], data[i + 2]]; - var hsl = this.rgb2hsl(rgb); + let hslColor = this.rgb2hsl(this.splitrgb(color)); + let end = data.length; + for (let i = 0; i < end; i += 4) { + let rgb = [data[i], data[i + 1], data[i + 2]]; + let hsl = this.rgb2hsl(rgb); // Adjust the brightness - var adj = hslColor[2] - 0.5; // [-0.5, 0.5] - var tmp = hsl[2] - 0.5; // [-0.5, 0.5] + let adj = hslColor[2] - 0.5; // [-0.5, 0.5] + let tmp = hsl[2] - 0.5; // [-0.5, 0.5] // tweaks the middle lights either upward or downward, depending // on if source lightness is high or low - var l = hsl[2] - 2.0 * adj * ((tmp * tmp) - 0.25); - var resultHsl = [hslColor[0], hslColor[1], l]; - var resultRgb = this.hsl2rgb(resultHsl); + let l = hsl[2] - 2.0 * adj * ((tmp * tmp) - 0.25); + let resultHsl = [hslColor[0], hslColor[1], l]; + let resultRgb = this.hsl2rgb(resultHsl); data[i] = resultRgb[0]; data[i + 1] = resultRgb[1]; data[i + 2] = resultRgb[2]; } } - + + public filter(data: ImageData, filter: string, param?: number): void { if (filter ==='trueColor') { this.trueColor(data.data, param!); From 3b6d652aa8a714d40f23231ce02787a96c157423 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 2 Feb 2026 22:04:07 +0100 Subject: [PATCH 117/162] dont return the image in waitFor because it might have expired --- src/js/stendhal/sprite/image/ImageRef.ts | 4 ++-- src/js/stendhal/sprite/image/ImageRefImpl.ts | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/js/stendhal/sprite/image/ImageRef.ts b/src/js/stendhal/sprite/image/ImageRef.ts index 9e7402f0dd..d182f19a66 100644 --- a/src/js/stendhal/sprite/image/ImageRef.ts +++ b/src/js/stendhal/sprite/image/ImageRef.ts @@ -12,7 +12,7 @@ export abstract class ImageRef { image?: ImageBitmap; - async /*abstract */ waitFor(): Promise { - return new Promise(() => {}); + async /*abstract */ waitFor(): Promise { + return new Promise(() => {}); } } diff --git a/src/js/stendhal/sprite/image/ImageRefImpl.ts b/src/js/stendhal/sprite/image/ImageRefImpl.ts index 86d7411a39..a9d9a5ca42 100644 --- a/src/js/stendhal/sprite/image/ImageRefImpl.ts +++ b/src/js/stendhal/sprite/image/ImageRefImpl.ts @@ -16,10 +16,10 @@ export class ImageRefImpl extends ImageRef { private refCount = 0; private lastFreed?: Date; private closed = false; - private loaded: Promise; - private promiseResolve!: Function; + private loaded: Promise; + protected promiseResolve!: Function; - constructor(private filename: string) { + constructor(protected filename: string) { super(); this.loaded = new Promise((resolve) => { this.promiseResolve = resolve; @@ -30,15 +30,18 @@ export class ImageRefImpl extends ImageRef { let url = this.filename + "?v=" + stendhal.data.build.version; let response = await fetch(url); if (!response.ok || this.closed) { + this.promiseResolve(undefined) return; } let blob = await response.blob(); if (this.closed) { + this.promiseResolve(undefined) return; } let bitmap = await createImageBitmap(blob); if (this.closed) { bitmap.close(); + this.promiseResolve(undefined) return; } this.image = bitmap; @@ -75,7 +78,7 @@ export class ImageRefImpl extends ImageRef { this.image = undefined; } - override async waitFor(): Promise { + override async waitFor(): Promise { return this.loaded } } From 230b25e5fa6a79dad036556e0c363c7e312b66ed Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 2 Feb 2026 22:10:18 +0100 Subject: [PATCH 118/162] added support for filtered images --- .../sprite/image/FilteredImageRefImpl.ts | 31 +++++++++++++++++++ src/js/stendhal/sprite/image/ImageManager.ts | 17 +++++++--- 2 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 src/js/stendhal/sprite/image/FilteredImageRefImpl.ts diff --git a/src/js/stendhal/sprite/image/FilteredImageRefImpl.ts b/src/js/stendhal/sprite/image/FilteredImageRefImpl.ts new file mode 100644 index 0000000000..806610a1c1 --- /dev/null +++ b/src/js/stendhal/sprite/image/FilteredImageRefImpl.ts @@ -0,0 +1,31 @@ +/*************************************************************************** + * (C) Copyright 2003-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { images } from "./ImageManager"; +import { ImageFilter } from "./ImageFilter"; +import { ImageRefImpl } from "./ImageRefImpl"; + +export class FilteredImageRefImpl extends ImageRefImpl { + + constructor(filename: string, private filter: string, private param?: number) { + super(filename); + } + + override async load() { + let originalImage = images.load(this.filename); + await originalImage.waitFor(); + if (originalImage.image) { + this.image = new ImageFilter().filterImage(originalImage.image, this.filter, this.param); + } + images.free(this.filename); + this.promiseResolve(); + } +} diff --git a/src/js/stendhal/sprite/image/ImageManager.ts b/src/js/stendhal/sprite/image/ImageManager.ts index 751ccdfa11..4f6d6b8cd1 100644 --- a/src/js/stendhal/sprite/image/ImageManager.ts +++ b/src/js/stendhal/sprite/image/ImageManager.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { FilteredImageRefImpl } from "./FilteredImageRefImpl"; import { ImageRef } from "./ImageRef"; import { ImageRefImpl } from "./ImageRefImpl"; @@ -16,18 +17,24 @@ export class ImageManager { images = new Map(); - load(filename: string): ImageRef { - let imageRef = this.images.get(filename); + load(filename: string, filter?: string, param?: number): ImageRef { + let key = filename + "!" + filter + "!" + param; + let imageRef = this.images.get(key); if (!imageRef) { - imageRef = new ImageRefImpl(filename); + if (filter) { + imageRef = new FilteredImageRefImpl(filename, filter, param); + } else { + imageRef = new ImageRefImpl(filename); + } imageRef.load(); } imageRef.use(); return imageRef; } - free(filename: string) { - let imageRef = this.images.get(filename); + free(filename: string, filter?: string, param?: number) { + let key = filename + "!" + filter + "!" + param; + let imageRef = this.images.get(key); if (!imageRef) { console.error("freeing unknown image: " + filename); return; From c7befd2fe1a2019fc7633a3846485edfbe6f3659 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Wed, 4 Feb 2026 22:07:25 +0100 Subject: [PATCH 119/162] support cleanup of ImageManager --- src/js/stendhal/sprite/image/ImageManager.ts | 12 ++++++++++-- src/js/stendhal/sprite/image/ImageRefImpl.ts | 7 +++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/js/stendhal/sprite/image/ImageManager.ts b/src/js/stendhal/sprite/image/ImageManager.ts index 4f6d6b8cd1..8781ef95d6 100644 --- a/src/js/stendhal/sprite/image/ImageManager.ts +++ b/src/js/stendhal/sprite/image/ImageManager.ts @@ -27,6 +27,7 @@ export class ImageManager { imageRef = new ImageRefImpl(filename); } imageRef.load(); + this.images.set(key, imageRef); } imageRef.use(); return imageRef; @@ -36,13 +37,20 @@ export class ImageManager { let key = filename + "!" + filter + "!" + param; let imageRef = this.images.get(key); if (!imageRef) { - console.error("freeing unknown image: " + filename); + console.error("freeing unknown image: " + key); return; } imageRef.free(); } - // TODO: consider providing a new method: free(imageRef: ImageRef) + cleanup(olderThan: Date) { + for (let [key, imageRef] of this.images) { + if (imageRef.shouldCleanup(olderThan)) { + imageRef.close(); + this.images.delete(key); + } + } + } } diff --git a/src/js/stendhal/sprite/image/ImageRefImpl.ts b/src/js/stendhal/sprite/image/ImageRefImpl.ts index a9d9a5ca42..6d6f66dfe2 100644 --- a/src/js/stendhal/sprite/image/ImageRefImpl.ts +++ b/src/js/stendhal/sprite/image/ImageRefImpl.ts @@ -69,6 +69,13 @@ export class ImageRefImpl extends ImageRef { } } + shouldCleanup(olderThan: Date) { + if (this.refCount > 0 || !this.lastFreed) { + return false; + } + return (this.lastFreed < olderThan); + } + /** * called internally by ImageManager */ From 1bf34316fb912ba3e4ebe9057eb5ca2ef820dadc Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Wed, 4 Feb 2026 22:57:01 +0100 Subject: [PATCH 120/162] support ImageRef.free() without going through the ImageManager --- src/js/stendhal/sprite/image/ImageRef.ts | 2 ++ src/js/stendhal/sprite/image/ImageRefImpl.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/stendhal/sprite/image/ImageRef.ts b/src/js/stendhal/sprite/image/ImageRef.ts index d182f19a66..e8e2cb2ae9 100644 --- a/src/js/stendhal/sprite/image/ImageRef.ts +++ b/src/js/stendhal/sprite/image/ImageRef.ts @@ -15,4 +15,6 @@ export abstract class ImageRef { async /*abstract */ waitFor(): Promise { return new Promise(() => {}); } + + abstract free(): void; } diff --git a/src/js/stendhal/sprite/image/ImageRefImpl.ts b/src/js/stendhal/sprite/image/ImageRefImpl.ts index 6d6f66dfe2..a39b7599ea 100644 --- a/src/js/stendhal/sprite/image/ImageRefImpl.ts +++ b/src/js/stendhal/sprite/image/ImageRefImpl.ts @@ -59,7 +59,7 @@ export class ImageRefImpl extends ImageRef { /** * called internally by ImageManager */ - free() { + override free() { this.refCount--; if (this.refCount < 0) { console.error("Negative reference count", this); From 535e7f57274a57140e4b20c6a579725fa4fd0394 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Wed, 4 Feb 2026 22:57:48 +0100 Subject: [PATCH 121/162] use ImageManager images for preview of outfit parts into Outfit Dialog --- .../stendhal/ui/dialog/outfit/OutfitDialog.ts | 16 +++- .../ui/dialog/outfit/OutfitPartSelector.ts | 91 ++++++++++--------- 2 files changed, 61 insertions(+), 46 deletions(-) diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts index 5a267570d6..b0cccd3846 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts @@ -193,10 +193,10 @@ export class OutfitDialog extends DialogContentComponent { this.drawComposite(); }); - document.getElementById("setoutfitprev" + part)!.addEventListener("click", function(e) { + document.getElementById("setoutfitprev" + part)!.addEventListener("click", function(_e) { selector.previous(); }); - document.getElementById("setoutfitnext" + part)!.addEventListener("click", function(e) { + document.getElementById("setoutfitnext" + part)!.addEventListener("click", function(_e) { selector.next(); }); selector.draw(); @@ -224,7 +224,7 @@ export class OutfitDialog extends DialogContentComponent { return null; } - createColorSelector(classObject: any, part: string, ...partSelectors: any) { + createColorSelector(classObject: any, part: string, ...partSelectors: OutfitPartSelector[]) { const toggle = document.getElementById("setoutfit" + part + "colortoggle") as HTMLInputElement; const canvas = document.getElementById("setoutfit" + part + "colorcanvas")!; const gradientCanvas = document.getElementById("setoutfit" + part + "colorgradient"); @@ -238,7 +238,7 @@ export class OutfitDialog extends DialogContentComponent { toggle.checked = true; selector.color = initialColor; } - toggle.addEventListener("change", function(e) { + toggle.addEventListener("change", function(_e) { selector.enabled = toggle.checked; }); selector.draw(); @@ -247,6 +247,14 @@ export class OutfitDialog extends DialogContentComponent { public override onParentClose() { this.outfitPreview.close(); + this.hatSelector.close(); + this.hairSelector.close(); + this.maskSelector.close(); + this.eyesSelector.close(); + this.mouthSelector.close(); + this.headSelector.close(); + this.bodySelector.close(); + this.dressSelector.close(); ui.unregisterComponent(this); } } diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts index aaa529aa66..378ea6178b 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2015-2024 - Faiumoni e. V. * + * (C) Copyright 2015-2026 - Faiumoni e. V. * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -9,36 +9,37 @@ * * ***************************************************************************/ -import { singletons } from "../../../SingletonRepo"; import { Paths } from "../../../data/Paths"; import { RenderingContext2D } from "util/Types"; import { stendhal } from "../../../stendhal"; +import { ImageRef } from "sprite/image/ImageRef"; +import { images } from "sprite/image/ImageManager"; export class OutfitPartSelector { - private _part: string; - private _onPartChanged: Function; - private _index: number; - private _maxindex: number; - private _ctx: RenderingContext2D; - private _width: number; - private _height: number; - private _color?: any; - private _image?: Promise; + private part: string; + private onPartChanged: Function; + private _index: number; + private maxIndex: number; + private ctx: RenderingContext2D; + private width: number; + private height: number; + private _color?: any; + private imageRef!: ImageRef; constructor(part: string, initialIndex: any, maxindex: number, onPartChanged: Function) { - this._part = part; - this._onPartChanged = onPartChanged; + this.part = part; + this.onPartChanged = onPartChanged; this._index = parseInt(initialIndex, 10); - this._maxindex = maxindex; + this.maxIndex = maxindex; const canvas = document.getElementById('setoutfit' + part + 'canvas') as HTMLCanvasElement; canvas.style.margin = "5px"; - this._ctx = canvas.getContext("2d")!; - this._width = canvas.width; - this._height = canvas.height; + this.ctx = canvas.getContext("2d")!; + this.width = canvas.width; + this.height = canvas.height; this._color = undefined; - this._image = undefined; + this.loadPartSprite(); } @@ -54,20 +55,15 @@ export class OutfitPartSelector { } - draw() { - const image = this._getPartSprite(this._part, this._index, this._color); - this._image = image; - this._ctx.fillStyle = "white"; - this._ctx.fillRect(0, 0, this._width, this._height); + async draw() { + this.ctx.fillStyle = "white"; + this.ctx.fillRect(0, 0, this.width, this.height); - image.then((img: CanvasImageSource) => { - this._ctx.drawImage(img, -48, -128); - this._onPartChanged(); - }); - } - - get image() { - return this._image; + let currentImage = this.imageRef; + await currentImage.waitFor(); + if (currentImage === this.imageRef && currentImage.image) { + this.ctx.drawImage(currentImage.image, -48, -128); + } } get index() { @@ -76,42 +72,53 @@ export class OutfitPartSelector { set index(newIndex: any) { this._index = parseInt(newIndex, 10); + this.loadPartSprite(); this.draw(); } set color(newColor: any) { this._color = newColor; + this.loadPartSprite(); + this.onPartChanged(); this.draw(); } previous() { - const numOutfits = this._maxindex + 1; - this._index += this._maxindex; + const numOutfits = this.maxIndex + 1; + this._index += this.maxIndex; this._index %= numOutfits; + this.loadPartSprite(); + this.onPartChanged(); this.draw(); - this._onPartChanged(); } next() { - const numOutfits = this._maxindex + 1; + const numOutfits = this.maxIndex + 1; this._index++; this._index %= numOutfits; + this.loadPartSprite(); + this.onPartChanged(); this.draw(); - this._onPartChanged(); } - _getPartSprite(part: string, index: number, color = null): Promise { + private loadPartSprite() { + this.imageRef?.free(); let suffix = ".png"; - if (this._part === "body" && stendhal.config.getBoolean("effect.no-nude")) { + if (this.part === "body" && stendhal.config.getBoolean("effect.no-nude")) { suffix = "-nonude.png"; } // FIXME: need to draw "busty" dress variants for body index 1 - const fname = Paths.sprites + "/outfit/" + part + "/" + this.indexString(index) + suffix; - if (color != null) { - return singletons.getSpriteStore().getFilteredWithPromise(fname, "trueColor", color); + let fname = Paths.sprites + "/outfit/" + this.part + "/" + this.indexString(this._index) + suffix; + if (this._color != null) { + this.imageRef = images.load(fname, "trueColor", this._color); + } else { + this.imageRef = images.load(fname); } - return singletons.getSpriteStore().getWithPromise(fname); + } + + close() { + this.imageRef?.free(); } } From 0f3ecbd3dd92afcdbae76dddf01b7698746d4364 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Thu, 5 Feb 2026 22:08:12 +0100 Subject: [PATCH 122/162] code cleanup --- src/js/stendhal/sprite/image/HTMLImageElementUtil.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts b/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts index 96500d3dbf..4bbf76fff8 100644 --- a/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts +++ b/src/js/stendhal/sprite/image/HTMLImageElementUtil.ts @@ -10,7 +10,6 @@ ***************************************************************************/ import { ImageWithDimensions } from "data/ImageWithDimensions"; -import { store } from "../../data/SpriteStore"; export class HTMLImageElementUtil { From 659c155a361c5d7aed400f10558e16dec6242b97 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Thu, 5 Feb 2026 22:09:39 +0100 Subject: [PATCH 123/162] apply preferences to own outfit --- .../stendhal/ui/dialog/outfit/OutfitDialog.ts | 13 +++++++++---- .../ui/dialog/outfit/OutfitPartSelector.ts | 18 +++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts index b0cccd3846..fc234aa515 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts @@ -184,12 +184,17 @@ export class OutfitDialog extends DialogContentComponent { } makeSelector(part: string, index: number): OutfitPartSelector { - // FIXME: selector should be showing a default if index is less than 0 - if (index < 0 || index === undefined) { - index = 0; + let minIndex = 0; + if (part === "dress" && stendhal.config.getBoolean("effect.no-nude")) { + minIndex = 1; } - const selector = new OutfitPartSelector(part, index, stendhal.data.outfit.count[part] - 1, () => { + // FIXME: selector should be showing a default if index is less than 0 + if (index < minIndex || index === undefined) { + index = minIndex; + } + + const selector = new OutfitPartSelector(part, index, minIndex, stendhal.data.outfit.count[part] - 1, () => { this.drawComposite(); }); diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts index 378ea6178b..f784c623fb 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitPartSelector.ts @@ -20,6 +20,7 @@ export class OutfitPartSelector { private part: string; private onPartChanged: Function; private _index: number; + private minIndex: number; private maxIndex: number; private ctx: RenderingContext2D; private width: number; @@ -27,11 +28,12 @@ export class OutfitPartSelector { private _color?: any; private imageRef!: ImageRef; - constructor(part: string, initialIndex: any, maxindex: number, onPartChanged: Function) { + constructor(part: string, initialIndex: any, minIndex: number, maxIndex: number, onPartChanged: Function) { this.part = part; this.onPartChanged = onPartChanged; this._index = parseInt(initialIndex, 10); - this.maxIndex = maxindex; + this.minIndex = minIndex; + this.maxIndex = maxIndex; const canvas = document.getElementById('setoutfit' + part + 'canvas') as HTMLCanvasElement; canvas.style.margin = "5px"; @@ -84,18 +86,20 @@ export class OutfitPartSelector { } previous() { - const numOutfits = this.maxIndex + 1; - this._index += this.maxIndex; - this._index %= numOutfits; + this._index-- + if (this._index < this.minIndex) { + this._index = this.maxIndex; + } this.loadPartSprite(); this.onPartChanged(); this.draw(); } next() { - const numOutfits = this.maxIndex + 1; this._index++; - this._index %= numOutfits; + if (this._index > this.maxIndex) { + this._index = this.minIndex; + } this.loadPartSprite(); this.onPartChanged(); this.draw(); From 97ea5ab442071c4cd784fa8f1701430bf4a8313a Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Thu, 5 Feb 2026 22:09:59 +0100 Subject: [PATCH 124/162] use ImageManager --- .../sprite/image/MultilayerImageLoader.ts | 62 ++++++------------- 1 file changed, 19 insertions(+), 43 deletions(-) diff --git a/src/js/stendhal/sprite/image/MultilayerImageLoader.ts b/src/js/stendhal/sprite/image/MultilayerImageLoader.ts index 03c92f86aa..54de7cc0fa 100644 --- a/src/js/stendhal/sprite/image/MultilayerImageLoader.ts +++ b/src/js/stendhal/sprite/image/MultilayerImageLoader.ts @@ -11,64 +11,40 @@ ***************************************************************************/ import { ImageMetadata } from "./ImageMetadata"; -import { ImageFilter } from "./ImageFilter"; +import { images } from "./ImageManager"; +import { ImageRef } from "./ImageRef"; export class MultilayerImageLoader { - private images = new Map(); - private pending: number; - private canvas?: OffscreenCanvas; + private imageRefs: ImageRef[] = []; - constructor(private imageMetadatas: ImageMetadata[]) { - this.pending = imageMetadatas.length; } public async load() { - let promises: Promise[] = []; for (let imageMetadata of this.imageMetadatas) { - promises.push(this.loadImage(imageMetadata)); + this.imageRefs.push(images.load(imageMetadata.filename, imageMetadata.filter, imageMetadata.color)); } - if (promises.length) { - await Promise.all(promises); - } else { - this.finish(); + for (let imageRef of this.imageRefs) { + await imageRef.waitFor(); } - return this.canvas!.transferToImageBitmap(); - } - private async loadImage(imageMetadata: ImageMetadata) { - let response = await fetch(imageMetadata.filename); - if (response.ok) { - let blob = await response.blob(); - let bitmap = await createImageBitmap(blob); - if (imageMetadata.filter) { - let filteredBitmap = new ImageFilter().filterImage(bitmap, imageMetadata.filter, imageMetadata.color); - bitmap.close(); - bitmap = filteredBitmap; + let canvas: OffscreenCanvas|undefined = undefined; + let ctx: OffscreenCanvasRenderingContext2D|undefined = undefined; + for (let imageRef of this.imageRefs) { + if (imageRef.image) { + if (!canvas) { + canvas = new OffscreenCanvas(imageRef.image.width, imageRef.image.height); + ctx = canvas.getContext("2d")!; + } + ctx?.drawImage(imageRef.image, 0, 0); + imageRef.free(); } - this.images.set(imageMetadata, bitmap); } - this.pending--; - if (this.pending <= 0) { - this.finish(); - } - } - - private finish() { - let first = undefined; - if (this.images.size) { - first = this.images.values().next().value; - } - // TODO: have a global constant of an empty Canvas and an empty ImageBitmap - this.canvas = new OffscreenCanvas(first?.width || 0, first?.height || 0); - let ctx = this.canvas.getContext("2d")!; - - for (let imageMetadata of this.imageMetadatas) { - let image = this.images.get(imageMetadata)!; - ctx.drawImage(image, 0, 0); - image.close(); + if (!canvas) { + canvas = new OffscreenCanvas(0, 0); } + return canvas.transferToImageBitmap(); } } From 07a41fddfe87848222f9bafb6399c63d54fa6bf4 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 7 Feb 2026 02:01:21 +0100 Subject: [PATCH 125/162] cache tileset-images to speed up zone changes --- .../landscape/CombinedTilesetImageLoader.ts | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts index 91e69940d6..8ebb715d27 100644 --- a/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts +++ b/src/js/stendhal/landscape/CombinedTilesetImageLoader.ts @@ -16,11 +16,13 @@ import { CombinedTileset } from "./CombinedTileset"; import { Debug } from "../util/Debug"; import { stendhal } from "../stendhal"; +import { images } from "sprite/image/ImageManager"; +import { ImageRef } from "sprite/image/ImageRef"; export class CombinedTilesetImageLoader { private tileUsedAtIndex!: MapOfSets - private tilesetImages: ImageBitmap[] = []; + private tilesetImages: ImageRef[] = []; private drawCanvas: Canvas; private drawCtx: RenderingContext2D; private blendCanvas: Canvas; @@ -31,9 +33,9 @@ export class CombinedTilesetImageLoader { private usedTilesetCount = 0; constructor( - private map: TileMap, - private indexToCombinedTiles: Map, - private combinedTileset: CombinedTileset) { + private map: TileMap, + private indexToCombinedTiles: Map, + private combinedTileset: CombinedTileset) { this.drawCanvas = new OffscreenCanvas(this.map.tileWidth, this.map.tileHeight); this.blendCanvas = new OffscreenCanvas(this.map.tileWidth, this.map.tileHeight); @@ -69,32 +71,29 @@ export class CombinedTilesetImageLoader { if (!tsname) { return; } - let url = tsname + "?v=" + stendhal.data.build.version; - // TODO: deal with errors - let response = await fetch(url); - if (!response.ok) { - return; - } - let blob = await response.blob(); - let bitmap = await createImageBitmap(blob); - this.tilesetImages[tileset] = bitmap; + let imageRef = images.load(tsname); + await imageRef.waitFor(); + this.tilesetImages[tileset] = imageRef; this.loadedTilesetCount++; - this.drawTileset(tileset); + this.drawTileset(tileset); if (this.loadedTilesetCount >= this.usedTilesetCount) { this.finish(); } } private finish() { - for (let bitmap of this.tilesetImages) { - bitmap.close(); + for (let imageRef of this.tilesetImages) { + imageRef.free(); } } private drawTileset(tileset: number): void { let firstGid = this.map.firstgids[tileset]; - let image = this.tilesetImages[tileset]; + let image = this.tilesetImages[tileset].image; + if (!image) { + return; + } let numberOfTiles = image.width / this.map.tileWidth * image.height / this.map.tileHeight; let lastGid = firstGid + numberOfTiles; @@ -176,8 +175,8 @@ export class CombinedTilesetImageLoader { let flip = tile & 0xE0000000; let gid = tile & 0x1FFFFFFF; let tileset = this.map.getTilesetForGid(gid); - let image = this.tilesetImages[tileset]; - if (!image || !image.height) { + let image = this.tilesetImages[tileset]?.image; + if (!image) { return; } @@ -192,11 +191,11 @@ export class CombinedTilesetImageLoader { if (flip === 0) { ctx.drawImage(tilesetImage, - (tileIndexInTileset % tilesPerRow) * this.map.tileWidth, - Math.floor(tileIndexInTileset / tilesPerRow) * this.map.tileHeight, - this.map.tileWidth, this.map.tileHeight, - pixelX, pixelY, - this.map.tileWidth, this.map.tileHeight); + (tileIndexInTileset % tilesPerRow) * this.map.tileWidth, + Math.floor(tileIndexInTileset / tilesPerRow) * this.map.tileHeight, + this.map.tileWidth, this.map.tileHeight, + pixelX, pixelY, + this.map.tileWidth, this.map.tileHeight); } else { ctx.translate(pixelX, pixelY); From b796ba36b073b493804f8ff601012f2e5232cb57 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 7 Feb 2026 02:01:55 +0100 Subject: [PATCH 126/162] use ImageManager instead of SpriteStore --- .../stendhal/landscape/ParallaxBackground.ts | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/js/stendhal/landscape/ParallaxBackground.ts b/src/js/stendhal/landscape/ParallaxBackground.ts index 214113f092..574132be25 100644 --- a/src/js/stendhal/landscape/ParallaxBackground.ts +++ b/src/js/stendhal/landscape/ParallaxBackground.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright © 2024 - Faiumoni e. V. * + * Copyright © 2024-2026 - Faiumoni e. V. * *************************************************************************** *************************************************************************** * * @@ -12,7 +12,8 @@ import { RenderingContext2D } from "util/Types"; import { singletons } from "../SingletonRepo"; - +import { ImageRef } from "sprite/image/ImageRef"; +import { images } from "sprite/image/ImageManager"; export class ParallaxBackground { @@ -20,7 +21,7 @@ export class ParallaxBackground { public static readonly SCROLL = 0.25; /** Tiled image to be drawn. */ - private image?: HTMLImageElement; + private imageRef?: ImageRef; /** Singleton instance. */ private static instance: ParallaxBackground; @@ -55,8 +56,8 @@ export class ParallaxBackground { * Map pixel height. */ setImage(name: string, width: number, height: number) { - const fullPath = singletons.getPaths().parallax + "/" + name + ".png"; - this.image = singletons.getSpriteStore().get(fullPath); + let fullPath = singletons.getPaths().parallax + "/" + name + ".png"; + this.imageRef = images.load(fullPath); /* FIXME: //this.image = singletons.getTileStore().getParallax(name, ParallaxBackground.SCROLL, width, height); @@ -73,20 +74,22 @@ export class ParallaxBackground { * Unsets parallax background image. */ reset() { - this.image = undefined; + this.imageRef?.free(); + this.imageRef = undefined; } draw(ctx: RenderingContext2D, offsetX: number, offsetY: number) { - if (!this.image || !this.image.height) { + if (!this.imageRef?.image) { return; } + let image = this.imageRef.image; // FIXME: seams are visible when walking - let dy = offsetY - ((offsetY / 4) % this.image.height); - for (dy; dy < this.image.height * 100; dy += this.image.height) { - let dx = offsetX - ((offsetX / 4) % this.image.width); - for (dx; dx < this.image.width * 100; dx += this.image.width) { - ctx.drawImage(this.image, dx, dy); + let dy = offsetY - ((offsetY / 4) % image.height); + for (dy; dy < image.height * 100; dy += image.height) { + let dx = offsetX - ((offsetX / 4) % image.width); + for (dx; dx < image.width * 100; dx += image.width) { + ctx.drawImage(image, dx, dy); } } From b479ec3d5228c72ad997e76804474e3368af5c2f Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 7 Feb 2026 02:02:11 +0100 Subject: [PATCH 127/162] use ImageManager instead of SpriteStore for weather images --- src/js/stendhal/data/SpriteStore.ts | 5 -- src/js/stendhal/util/WeatherRenderer.ts | 95 +++++++++++-------------- 2 files changed, 41 insertions(+), 59 deletions(-) diff --git a/src/js/stendhal/data/SpriteStore.ts b/src/js/stendhal/data/SpriteStore.ts index 408f4ae139..1b775d27e7 100644 --- a/src/js/stendhal/data/SpriteStore.ts +++ b/src/js/stendhal/data/SpriteStore.ts @@ -368,11 +368,6 @@ export class SpriteStore { "underground_zone"]) { this.get(Paths.achievements + "/" + cat + ".png"); } - // weather - for (const weather of ["clouds", "fog", "fog_heavy", "rain", "rain_heavy", - "rain_light", "snow", "snow_heavy", "snow_light", "wave"]) { - this.get(Paths.weather + "/" + weather + ".png"); - } } } diff --git a/src/js/stendhal/util/WeatherRenderer.ts b/src/js/stendhal/util/WeatherRenderer.ts index acf0c25791..6d785def91 100644 --- a/src/js/stendhal/util/WeatherRenderer.ts +++ b/src/js/stendhal/util/WeatherRenderer.ts @@ -9,7 +9,6 @@ * * ***************************************************************************/ -import { singletons } from "../SingletonRepo"; import { Paths } from "../data/Paths"; import { TileStore } from "../data/TileStore"; @@ -17,6 +16,8 @@ import { SoundObject } from "../data/sound/SoundFactory"; import { Canvas, RenderingContext2D } from "./Types"; import { stendhal } from "../stendhal"; +import { ImageRef } from "sprite/image/ImageRef"; +import { images } from "sprite/image/ImageManager"; const weatherLoops = { @@ -25,7 +26,7 @@ const weatherLoops = { "rain_light": true } as {[key: string]: boolean}; -interface WeatherSprite extends HTMLImageElement { +interface WeatherSprite extends ImageRef { frames: number[]; delays: number[]; } @@ -33,7 +34,6 @@ interface WeatherSprite extends HTMLImageElement { export class WeatherRenderer { private enabled = true; - private warned: {[key: string]: boolean} = {}; private sprite?: WeatherSprite; private frameIdx = 0; private lastUpdate = 0; @@ -81,7 +81,7 @@ export class WeatherRenderer { * @param weather * Weather type identifier. */ - update(weather?: string) { + async update(weather?: string) { this.enabled = stendhal.config.getBoolean("effect.weather"); if (!this.enabled) { // prevent playing sound & other weather-related instructions @@ -97,8 +97,6 @@ export class WeatherRenderer { this.frameIdx = 0; this.lastUpdate = Date.now(); - // reset warning messages - this.warned = {}; // stop previous sounds // FIXME: should continue playing if weather is same on next map @@ -111,41 +109,33 @@ export class WeatherRenderer { this.sprite = undefined; } else { const img = Paths.weather + "/" + weather + ".png"; - this.sprite = singletons.getSpriteStore().get(img); + let sprite = images.load(img) + await sprite.waitFor(); + if (weather != this.weatherName || !sprite.image) { + sprite.free(); + return; + } + /* FIXME: * "TypeError: $stendhal$$.data.$tileset$.$weatherAnimationMap$ * is undefined". TileStore.weatherMap is not always loaded * before this is called. */ const animationMap = TileStore.get().getWeatherMap()[img]; - - if (!this.sprite || !this.sprite.src) { - console.error("weather sprite for '" + weather + "' not found"); - return; - } - //~ if (!animationMap) { - //~ console.error("weather animation map for '" + weather + "' not loaded"); - //~ return; if (animationMap && Object.keys(animationMap).length == 0) { console.error("weather animation map for '" + weather + "' is empty"); return; } if (animationMap) { - this.sprite.frames = animationMap[0].frames; - this.sprite.delays = animationMap[0].delays; + sprite.frames = animationMap[0].frames; + sprite.delays = animationMap[0].delays; } else { // weather is not animated - this.sprite.frames = [0]; - } - - let spriteH = this.sprite.height; - // failsafe assumes min sprite dimensions to be 32x32 - if (!spriteH) { - spriteH = 32; - console.log("using failsafe sprite height: " + spriteH); + sprite.frames = [0]; } + let spriteH = sprite.image.height; const canvas = document.getElementById("viewport") as Canvas; this.tilesX = Math.ceil(canvas.width / spriteH) + 1; this.tilesY = Math.ceil(canvas.height / spriteH) + 1; @@ -153,6 +143,7 @@ export class WeatherRenderer { if (weatherLoops[weather]) { this.audio = stendhal.sound.playGlobalizedLoop("weather/" + weather, this.soundLayer); } + this.sprite = sprite; } } @@ -163,31 +154,19 @@ export class WeatherRenderer { * Drawing target element. */ draw(ctx: RenderingContext2D) { - if (this.enabled && this.sprite && this.sprite.frames) { - if (!this.tilesX || !this.tilesY) { - if (!this.warned.tiling) { - console.warn("cannot tile weather animation"); - this.warned.tiling = true; - } - return; - } - if (!this.sprite.height) { - if (!this.warned.imgReady) { - console.warn("waiting on image to load before drawing weather"); - this.warned.imgReady = true; - } - return; - } - if (this.weatherName === "clouds") { - ctx.save(); - ctx.globalAlpha = 0.80; - this.drawClouds(ctx, stendhal.ui.gamewindow.offsetX, stendhal.ui.gamewindow.offsetY); - ctx.restore(); - } else if (this.fog) { - this.drawFog(ctx, stendhal.ui.gamewindow.offsetX, stendhal.ui.gamewindow.offsetY); - } else { - this.drawOther(ctx, stendhal.ui.gamewindow.offsetX, stendhal.ui.gamewindow.offsetY); - } + if (!this.enabled || !this.sprite || !this.sprite.frames) { + return; + } + + if (this.weatherName === "clouds") { + ctx.save(); + ctx.globalAlpha = 0.80; + this.drawClouds(ctx, stendhal.ui.gamewindow.offsetX, stendhal.ui.gamewindow.offsetY); + ctx.restore(); + } else if (this.fog) { + this.drawFog(ctx, stendhal.ui.gamewindow.offsetX, stendhal.ui.gamewindow.offsetY); + } else { + this.drawOther(ctx, stendhal.ui.gamewindow.offsetX, stendhal.ui.gamewindow.offsetY); } } @@ -199,9 +178,13 @@ export class WeatherRenderer { * @param {number} offsetY */ private drawClouds(ctx: RenderingContext2D, offsetX: number, offsetY: number) { + let image = this.sprite?.image; + if (!image) { + return + } const drawStart = Date.now(); const timeDiff = drawStart - this.lastUpdate; - const dim = {width: this.sprite!.width, height: this.sprite!.height}; + const dim = {width: image.width, height: image.height}; // horizontal drift rate for wind effect (1 pixel per 100 milliseconds) let wind = Math.floor(timeDiff / 100); @@ -219,7 +202,7 @@ export class WeatherRenderer { for (let dy = -clipTop; dy < offsetY + ctx.canvas.height; dy += dim.height) { for (let dx = -clipLeft; dx < offsetX + ctx.canvas.width; dx += dim.width) { - ctx.drawImage(this.sprite!, + ctx.drawImage(image, 0, 0, dim.width, dim.height, dx, dy, dim.width, dim.height); } @@ -251,13 +234,17 @@ export class WeatherRenderer { * @param {number} offsetY */ private drawOther(ctx: RenderingContext2D, offsetX: number, offsetY: number) { + let image = this.sprite?.image; + if (!image) { + return + } // width & height dimensions should be the same - const dim = this.sprite!.height; + const dim = image.height; const clipLeft = offsetX % dim; const clipTop = offsetY % dim; for (let ix = 0; ix < this.tilesX; ix++) { for (let iy = 0; iy < this.tilesY; iy++) { - ctx.drawImage(this.sprite!, + ctx.drawImage(image, this.sprite!.frames[this.frameIdx]*dim, 0, dim, dim, From 404263a1ef14810678f2d1cb28e5deacf99319a4 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 7 Feb 2026 22:23:33 +0100 Subject: [PATCH 128/162] code cleanup --- src/js/stendhal/data/SpriteStore.ts | 49 ------------------- .../ui/component/ItemInventoryComponent.ts | 1 - 2 files changed, 50 deletions(-) diff --git a/src/js/stendhal/data/SpriteStore.ts b/src/js/stendhal/data/SpriteStore.ts index 1b775d27e7..20716140a1 100644 --- a/src/js/stendhal/data/SpriteStore.ts +++ b/src/js/stendhal/data/SpriteStore.ts @@ -108,23 +108,6 @@ export class SpriteStore { return temp; } - getWithPromise(filename: string): any { - return new Promise((resolve) => { - if (typeof(this.images[filename]) != "undefined") { - this.images[filename].counter++; - resolve(this.images[filename]); - } - - const image = new Image() as SpriteImage; - // TypeError: Image constructor: 'new' is required - //~ const image = new SpriteImage(); - image.counter = 0; - this.images[filename] = image; - image.onload = () => resolve(image); - image.src = filename; - }); - } - /** * Rotates an image. * @@ -289,38 +272,6 @@ export class SpriteStore { return filtered; } - /** - * @param {string} fileName - * @param {string} filter - * @param {number=} param - */ - getFilteredWithPromise(fileName: string, filter: string, param?: number) { - const imgPromise = this.getWithPromise(fileName); - return imgPromise.then((img: HTMLImageElement) => { - if (!img.complete || img.width === 0 || img.height === 0) { - return img; - } - const filteredName = fileName + " " + filter + " " + param; - let filtered: SpriteImage = this.images[filteredName]; - if (typeof(filtered) === "undefined") { - const canvas = document.createElement("canvas") as any; - canvas.width = img.width; - canvas.height = img.height; - const ctx = canvas.getContext("2d")!; - ctx.drawImage(img, 0, 0); - const imgData = ctx.getImageData(0, 0, img.width, img.height); - new ImageFilter().filter(imgData, filter, param); - ctx.putImageData(imgData, 0, 0); - canvas.complete = true; - this.images[filteredName] = filtered = canvas as SpriteImage; - } - - return filtered; - }); - } - - - /** * Retrieves a shadow sprite if the style is available. diff --git a/src/js/stendhal/ui/component/ItemInventoryComponent.ts b/src/js/stendhal/ui/component/ItemInventoryComponent.ts index 874e829169..7ad2dea094 100644 --- a/src/js/stendhal/ui/component/ItemInventoryComponent.ts +++ b/src/js/stendhal/ui/component/ItemInventoryComponent.ts @@ -68,7 +68,6 @@ export class ItemInventoryComponent extends Component { public override onParentClose() { let idx = stendhal.ui.equip.indexOf(this.itemContainerImplementation); - console.log(stendhal.ui.equip.getInventory(), idx); if (idx < 0) { console.log("Cannot cleanup unknown itemContainerImplementation"); return; From 72f23a7bc12bddbe9c5bb768ffb4b5fcc779a218 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sat, 7 Feb 2026 22:24:24 +0100 Subject: [PATCH 129/162] call super.destroy() --- src/js/stendhal/entity/RPEntity.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/js/stendhal/entity/RPEntity.ts b/src/js/stendhal/entity/RPEntity.ts index e4c1a47b2d..62324d85f0 100644 --- a/src/js/stendhal/entity/RPEntity.ts +++ b/src/js/stendhal/entity/RPEntity.ts @@ -847,10 +847,11 @@ export class RPEntity extends ActiveEntity { } } - override destroy(_obj: Entity) { + override destroy(obj: Entity) { if (this._target) { this._target.onAttackStopped(this); } + super.destroy(obj); } /** From 7c5cef1181a250fd23db63d77406121ffff320ea Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 8 Feb 2026 00:27:36 +0100 Subject: [PATCH 130/162] fixed ctrl direction change --- src/js/stendhal/entity/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/stendhal/entity/User.ts b/src/js/stendhal/entity/User.ts index a07c0ccb5e..9b88fe5696 100644 --- a/src/js/stendhal/entity/User.ts +++ b/src/js/stendhal/entity/User.ts @@ -225,7 +225,7 @@ export class User extends Player { * @param dir {util.Direction.Direction} * New direction to face. */ - public setFacing(dir: Direction) { + public faceTo(dir: Direction) { marauroa.clientFramework.sendAction({type: "face", dir: ""+dir.val}); } From 86cf9c0959d2b3c6ae59abef84473333ca1a44e0 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 8 Feb 2026 15:19:16 +0100 Subject: [PATCH 131/162] deleted class ImageSprite --- src/js/stendhal/data/SpriteStore.ts | 47 ++++++----------------------- 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/src/js/stendhal/data/SpriteStore.ts b/src/js/stendhal/data/SpriteStore.ts index 20716140a1..09cf52b6d5 100644 --- a/src/js/stendhal/data/SpriteStore.ts +++ b/src/js/stendhal/data/SpriteStore.ts @@ -12,16 +12,10 @@ import { Paths } from "./Paths"; import { ImageFilter } from "../sprite/image/ImageFilter"; - -export class SpriteImage extends Image { - // number of times the image has been accessed after initial creation - counter = 0; -} - export class SpriteStore { private knownBrokenUrls: {[url: string]: boolean} = {}; - private images: {[filename: string]: SpriteImage} = {}; + private images: {[filename: string]: CanvasImageSource} = {}; private knownShadows: {[key: string]: boolean} = { "24x32": true, @@ -84,14 +78,10 @@ export class SpriteStore { return {}; } if (this.images[filename]) { - this.images[filename].counter++; return this.images[filename]; } - var temp = new Image() as SpriteImage; - // TypeError: Image constructor: 'new' is required - //~ var temp = new SpriteImage(); - temp.counter = 0; - temp.onerror = (function(t: SpriteImage, store: SpriteStore) { + var temp = new Image(); + temp.onerror = (function(t: HTMLImageElement, store: SpriteStore) { return function() { if (t.src && !store.knownBrokenUrls[t.src]) { console.log("Broken image path:", t.src, new Error()); @@ -152,8 +142,7 @@ export class SpriteStore { } // NOTE: cannot use HTMLImageElement.cloneNode here, must get base image then transfer // `src` property when ready - const img = new Image() as SpriteImage; - img.counter = 0; + const img = new Image(); img.onload = () => { img.onload = null; this.rotate(img, angle); @@ -179,8 +168,7 @@ export class SpriteStore { * @param {SpriteImage} * Image to be cached. */ - cache(id: string, image: SpriteImage) { - image.counter = 0; + cache(id: string, image: CanvasImageSource) { this.images[id] = image; } @@ -206,14 +194,12 @@ export class SpriteStore { const filename = Paths.sprites + "/failsafe.png"; let failsafe = this.images[filename]; if (failsafe) { - failsafe.counter++; } else { - failsafe = new Image() as SpriteImage; - failsafe.counter = 0; + failsafe = new Image(); failsafe.src = filename; this.images[filename] = failsafe; } - return failsafe; + return failsafe as HTMLImageElement; } /** @@ -228,21 +214,6 @@ export class SpriteStore { return this.get(filename).src; } - /** deletes all objects that have not been accessed since this method was called last time */ - // TODO: call clean on map change - clean() { - for (var i in this.images) { - console.log(typeof(this.images[i])); - if (this.images[i] instanceof SpriteImage) { - if (this.images[i].counter > 0) { - this.images[i].counter--; - } else { - delete(this.images[i]); - } - } - } - } - /** * @param {string} fileName @@ -255,7 +226,7 @@ export class SpriteStore { return img; } const filteredName = fileName + " " + filter + " " + param; - let filtered: SpriteImage = this.images[filteredName]; + let filtered = this.images[filteredName]; if (typeof(filtered) === "undefined") { const canvas = document.createElement("canvas") as any; canvas.width = img.width; @@ -266,7 +237,7 @@ export class SpriteStore { new ImageFilter().filter(imgData, filter, param); ctx.putImageData(imgData, 0, 0); canvas.complete = true; - this.images[filteredName] = filtered = canvas as SpriteImage; + this.images[filteredName] = filtered = canvas; } return filtered; From 13fc7f6b1a672b003967ddd19b6d0423102a42d1 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 8 Feb 2026 16:45:36 +0100 Subject: [PATCH 132/162] deleted unused classes EmptySprite, ImageSprite, Sprite, Tileset --- src/js/stendhal/sprite/EmptySprite.ts | 114 ---------------- src/js/stendhal/sprite/ImageSprite.ts | 190 -------------------------- src/js/stendhal/sprite/Sprite.ts | 105 -------------- src/js/stendhal/sprite/Tileset.ts | 37 ----- 4 files changed, 446 deletions(-) delete mode 100644 src/js/stendhal/sprite/EmptySprite.ts delete mode 100644 src/js/stendhal/sprite/ImageSprite.ts delete mode 100644 src/js/stendhal/sprite/Sprite.ts delete mode 100644 src/js/stendhal/sprite/Tileset.ts diff --git a/src/js/stendhal/sprite/EmptySprite.ts b/src/js/stendhal/sprite/EmptySprite.ts deleted file mode 100644 index 856d879b51..0000000000 --- a/src/js/stendhal/sprite/EmptySprite.ts +++ /dev/null @@ -1,114 +0,0 @@ -/*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * - *************************************************************************** - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - ***************************************************************************/ - -import { RenderingContext2D } from "util/Types"; -import { Sprite } from "./Sprite"; - - -/** - * An empty (non-drawing) sprite. - */ -export class EmptySprite { - - public constructor(private width: number, private height: number, private reference?: object) { - - } - - /** - * Create a sub-region of this sprite. NOTE: This does not use - * caching. - * - * @param x - * The starting X coordinate. - * @param y - * The starting Y coordinate. - * @param width - * The region width. - * @param height - * The region height. - * @param ref - * The sprite reference. - * - * @return A new sprite. - */ - createRegion(x: number, y: number, width: number, height: number, ref: object): Sprite { - return new EmptySprite(width, height, ref); - } - - /** - * Draw the sprite onto the graphics context provided. - * - * @param g - * The graphics context on which to draw the sprite - * @param x - * The x location at which to draw the sprite - * @param y - * The y location at which to draw the sprite - */ - draw(g: RenderingContext2D, x: number, y: number): void; - - /** - * Draws the image. - * - * @param g - * the graphics context where to draw to - * @param destx - * destination x - * @param desty - * destination y - * @param x - * the source x - * @param y - * the source y - * @param w - * the width - * @param h - * the height - */ - public draw(g: RenderingContext2D, destx: number, desty: number, x: number, y: number, w: number, h: number): void; - public draw(g: RenderingContext2D, destx: number, desty: number, x?: number, y?: number, w?: number, h?: number): void { - } - - /** - * Get the height of the drawn sprite. - * - * @return The height in pixels of this sprite - */ - public getHeight(): number { - return this.height; - } - - /** - * Get the sprite reference. This identifier is an externally opaque object - * that implements equals() and hashCode() to uniquely/repeatably reference - * a keyed sprite. - * - * @return The reference identifier, or null if not - * referencable. - */ - public getReference(): object | undefined { - return this.reference; - } - - /** - * Get the width of the drawn sprite. - * - * @return The width in pixels of this sprite - */ - public getWidth(): number { - return this.width;; - } - - public isConstant(): boolean { - return true; - } -} diff --git a/src/js/stendhal/sprite/ImageSprite.ts b/src/js/stendhal/sprite/ImageSprite.ts deleted file mode 100644 index 68106b9746..0000000000 --- a/src/js/stendhal/sprite/ImageSprite.ts +++ /dev/null @@ -1,190 +0,0 @@ -/*************************************************************************** - * (C) Copyright 2003-2026 - Stendhal * - *************************************************************************** - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - ***************************************************************************/ - -import { ImageWithDimensions } from "data/ImageWithDimensions"; -import { EmptySprite } from "./EmptySprite"; -import { Sprite } from "./Sprite"; -import { Canvas, RenderingContext2D } from "util/Types"; - -/** - * A sprite to be displayed on the screen. Note that a sprite contains no state - * information, i.e. its just the image and not the location. This allows us to - * use a single sprite in lots of different places without having to store - * multiple copies of the image. - * - * @author Kevin Glass - */ -export class ImageSprite implements Sprite { - - /** The image to be drawn for this sprite. */ - private image: CanvasImageSource & ImageWithDimensions; - - /** - * The identifier reference. - */ - private reference?: object; - - /** - * Create a new sprite based on an image. - * - * @param image - * The image that is this sprite. - * @param reference - * The sprite reference, or null. - */ - public constructor (image: CanvasImageSource & ImageWithDimensions | Sprite, reference?: object) { - if (image instanceof Sprite) { - this.image = ImageSprite.createCompatibleImage(image); - } else { - this.image = image; - } - this.reference = reference; - } - - private static createCompatibleImage(sprite: Sprite): Canvas { - const canvas = new OffscreenCanvas(sprite.getWidth(), sprite.getHeight()); - const g = canvas.getContext('2d'); - sprite.draw(g!, 0, 0); - return canvas; - } - - - /** - * Create a sub-region of this sprite. NOTE: This does not use - * caching. - * - * @param x - * The starting X coordinate. - * @param y - * The starting Y coordinate. - * @param width - * The region width. - * @param height - * The region height. - * @param ref - * The sprite reference. - * - * @return A new sprite. - */ - public createRegion(x: number, y: number, width: number, height: number, ref?: object): Sprite { - const iwidth = this.getWidth(); - const iheight = this.getHeight(); - - if ((x >= iwidth) || (y >= iheight)) { - // Outside of image (nothing to draw) - return new EmptySprite(width, height, ref); - } - - // Exclude regions outside the original image - width = Math.min(width, iwidth); - height = Math.min(height, iheight); - - // Full copy method (the memory hog) - const canvas = new OffscreenCanvas(width, height); - const g = canvas.getContext('2d'); - this.draw(g!, 0, 0, x, y, width, height); - - return new ImageSprite(canvas, ref); - } - - /** - * Draw the sprite onto the graphics context provided. - * - * @param g - * The graphics context on which to draw the sprite - * @param x - * The x location at which to draw the sprite - * @param y - * The y location at which to draw the sprite - */ - public draw(g: RenderingContext2D, destx: number, desty: number): void; - - /** - * Draws the image. - * - * @param g - * the graphics context where to draw to - * @param destx - * destination x - * @param desty - * destination y - * @param x - * the source x - * @param y - * the source y - * @param w - * the width - * @param h - * the height - */ - public draw(g: RenderingContext2D, destx: number, desty: number, x: number, y: number, w: number, h: number): void; - public draw(g: RenderingContext2D, destx: number, desty: number, x?: number, y?: number, w?: number, h?: number): void { - if (arguments.length === 7) { - g.drawImage(this.image, destx, desty, destx + w!, desty + h!, x!, y!, x! + w!, y! + h!); - } else { - g.drawImage(this.image, destx, desty); - } - } - - /** - * Get the height of the drawn sprite. - * - * @return The height in pixels of this sprite - */ - public getHeight(): number { - return this.image.height as number; - } - - /** - * Get the sprite reference. This identifier is an externally opaque object - * that implements equals() and hashCode() to uniquely/repeatably reference - * a keyed sprite. - * - * @return The reference identifier, or null if not - * referencable. - */ - public getReference(): object | undefined { - return this.reference; - } - - /** - * Get the width of the drawn sprite. - * - * @return The width in pixels of this sprite - */ - public getWidth(): number { - return this.image.width as number; - } - - public isConstant(): boolean { - return true; - } - - /** - * Retrieves a single frame from the image. - * - * @param xIndex - * Horizontal index. - * @param yIndex - * Vertical index. - * @return - * Cropped Sprite. - */ - public getFrame(xIndex: number, yIndex: number): Sprite { - const w = this.getWidth() / 3; - const h = this.getHeight() / 4; - const x = w * xIndex; - const y = h * yIndex; - - return this.createRegion(x, y, w, h, undefined); - } -} diff --git a/src/js/stendhal/sprite/Sprite.ts b/src/js/stendhal/sprite/Sprite.ts deleted file mode 100644 index e64b52a3f5..0000000000 --- a/src/js/stendhal/sprite/Sprite.ts +++ /dev/null @@ -1,105 +0,0 @@ -/*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * - *************************************************************************** - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - ***************************************************************************/ - -import { RenderingContext2D } from "util/Types"; - - /** - * A sprite to be displayed on the screen. Note that a sprite contains no state - * information, i.e. its just the image and not the location. This allows us to - * use a single sprite in lots of different places without having to store - * multiple copies of the image. - */ -export abstract class Sprite { - - /** - * Create a sub-region of this sprite. NOTE: This does not use - * caching. - * - * @param x - * The starting X coordinate. - * @param y - * The starting Y coordinate. - * @param width - * The region width. - * @param height - * The region height. - * @param ref - * The sprite reference. - * - * @return A new sprite. - */ - abstract createRegion(x: number, y: number, width: number, height: number, ref: object): Sprite; - - /** - * Draw the sprite onto the graphics context provided. - * - * @param g - * The graphics context on which to draw the sprite - * @param x - * The x location at which to draw the sprite - * @param y - * The y location at which to draw the sprite - */ - abstract draw(g: RenderingContext2D, x: number, y: number): void; - - /** - * Draws the image. - * - * @param g - * the graphics context where to draw to - * @param destx - * destination x - * @param desty - * destination y - * @param x - * the source x - * @param y - * the source y - * @param w - * the width - * @param h - * the height - */ - abstract draw(g: RenderingContext2D, destx: number, desty: number, x: number, y: number, w: number, h: number): void; - - /** - * Get the height of the drawn sprite. - * - * @return The height in pixels of this sprite - */ - abstract getHeight(): number; - - /** - * Get the sprite reference. This identifier is an externally opaque object - * that implements equals() and hashCode() to uniquely/repeatably reference - * a keyed sprite. - * - * @return The reference identifier, or null if not - * referencable. - */ - abstract getReference(): object | undefined; - - /** - * Get the width of the drawn sprite. - * - * @return The width in pixels of this sprite - */ - abstract getWidth(): number; - - /** - * Check whether the sprite won't change between draws. - * - * @return true if different draws of the sprite always - * have the same result. - */ - abstract isConstant(): boolean; -} diff --git a/src/js/stendhal/sprite/Tileset.ts b/src/js/stendhal/sprite/Tileset.ts deleted file mode 100644 index aec50facb2..0000000000 --- a/src/js/stendhal/sprite/Tileset.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* $Id$ */ -/*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * - *************************************************************************** - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - ***************************************************************************/ - -import { Sprite } from "./Sprite"; - -/** - * A tileset. - */ -export interface Tileset { - - /** - * Get the number of tiles. - * - * @return The number of tiles. - */ - getSize(): number; - - /** - * Get the sprite for an index tile of a tileset. - * - * @param index - * The index with-in the tileset. - * - * @return A sprite, or null if no mapped sprite. - */ - getSprite(index: number): Sprite; -} From d846fa58180c7a4b213ff027f95da986e5b99086 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 8 Feb 2026 18:45:05 +0100 Subject: [PATCH 133/162] created an ImageSprite class for ImageManager ImageRefs and use it --- src/js/stendhal/entity/Entity.ts | 38 +++++++++++------ src/js/stendhal/sprite/image/ImageSprite.ts | 47 +++++++++++++++++++++ 2 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 src/js/stendhal/sprite/image/ImageSprite.ts diff --git a/src/js/stendhal/entity/Entity.ts b/src/js/stendhal/entity/Entity.ts index 8c1a2ee118..7bd55a2837 100644 --- a/src/js/stendhal/entity/Entity.ts +++ b/src/js/stendhal/entity/Entity.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2024 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -12,12 +12,13 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Chat } from "../util/Chat"; -import { RPObject } from "marauroa"; +import { RPObject, RPZone } from "marauroa"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; +import { ImageSprite } from "../sprite/image/ImageSprite"; /** * General entity @@ -28,6 +29,7 @@ export class Entity extends RPObject { minimapShow = false; minimapStyle = "rgb(200,255,200)"; zIndex = 10000; + imageSprite?: ImageSprite; override set(key: string, value: any) { super.set(key, value); @@ -208,7 +210,7 @@ export class Entity extends RPObject { } draw(ctx: RenderingContext2D) { - if (this.sprite) { + if (this.sprite || this.imageSprite) { this.drawSprite(ctx); } } @@ -221,18 +223,22 @@ export class Entity extends RPObject { } drawSpriteAt(ctx: RenderingContext2D, x: number, y: number) { - var image = singletons.getSpriteStore().get(this.sprite.filename); - if (image.height) { - var offsetX = this.sprite.offsetX || 0; - var offsetY = this.sprite.offsetY || 0; - var width = this.sprite.width || image.width; - var height = this.sprite.height || image.height; + if (this.imageSprite) { + this.imageSprite.drawOnto(ctx, x, y, this.getWidth() * 32, this.getHeight() * 32); + } else { + let image = singletons.getSpriteStore().get(this.sprite.filename); + if (image.height) { + let offsetX = this.sprite.offsetX || 0; + let offsetY = this.sprite.offsetY || 0; + let width = this.sprite.width || image.width; + let height = this.sprite.height || image.height; - // use entity dimensions to center sprite - x += Math.floor((this.getWidth() * 32 - width) / 2); - y += Math.floor((this.getHeight() * 32 - height) / 2); - - ctx.drawImage(image, offsetX, offsetY, width, height, x, y, width, height); + // use entity dimensions to center sprite + x += Math.floor((this.getWidth() * 32 - width) / 2); + y += Math.floor((this.getHeight() * 32 - height) / 2); + + ctx.drawImage(image, offsetX, offsetY, width, height, x, y, width, height); + } } } @@ -345,4 +351,8 @@ export class Entity extends RPObject { return ent_rect.right > view_rect.left && ent_rect.left < view_rect.right && ent_rect.bottom > view_rect.top && ent_rect.top < view_rect.bottom } + + override destroy(_parent: RPObject|RPZone) { + this.imageSprite?.free(); + } } diff --git a/src/js/stendhal/sprite/image/ImageSprite.ts b/src/js/stendhal/sprite/image/ImageSprite.ts new file mode 100644 index 0000000000..e96fdf4371 --- /dev/null +++ b/src/js/stendhal/sprite/image/ImageSprite.ts @@ -0,0 +1,47 @@ +/*************************************************************************** + * (C) Copyright 2003-2026 - Stendhal * + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + ***************************************************************************/ + +import { RenderingContext2D } from "util/Types"; +import { ImageRef } from "./ImageRef"; + + +export class ImageSprite { + + constructor( + public imageRef: ImageRef, + public offsetX?: number, + public offsetY?: number, + public width?: number, + public height?: number + ) { } + + drawOnto(ctx: RenderingContext2D, x: number, y: number, entityWidth: number, entityHeight: number) { + let image = this.imageRef.image; + if (!image) { + return; + } + let offsetX = this.offsetX || 0; + let offsetY = this.offsetY || 0; + let width = this.width || image.width; + let height = this.height || image.height; + + // use entity dimensions to center sprite + x += Math.floor((entityWidth - width) / 2); + y += Math.floor((entityHeight - height) / 2); + + ctx.drawImage(image, offsetX, offsetY, width, height, x, y, width, height); + } + + public free() { + this.imageRef.free(); + } + +} From c6a51ffcf3dca91c5e26ae6600ea26670e2bacb6 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 8 Feb 2026 18:45:22 +0100 Subject: [PATCH 134/162] converted Blood from SpriteStore to ImageManager --- src/js/stendhal/entity/Blood.ts | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/js/stendhal/entity/Blood.ts b/src/js/stendhal/entity/Blood.ts index 2048e345d3..6fed890f72 100644 --- a/src/js/stendhal/entity/Blood.ts +++ b/src/js/stendhal/entity/Blood.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2024 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -14,6 +14,8 @@ import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; import { stendhal } from "../stendhal"; +import { ImageSprite } from "sprite/image/ImageSprite"; +import { images } from "sprite/image/ImageManager"; export class Blood extends Entity { @@ -22,23 +24,26 @@ export class Blood extends Entity { constructor() { super(); - this.sprite = { - height: 32, - width: 32, - filename: Paths.sprites + "/combat/blood_red.png" - }; + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/combat/blood_red.png"), + 0, 0, 32, 32 + ); } override set(key: string, value: any) { super.set(key, value); if (key === "amount") { - this.sprite.offsetY = parseInt(value, 10) * 32; + this.imageSprite!.offsetY = parseInt(value, 10) * 32; } else if (key === "class") { - this.sprite.filename = Paths.sprites + "/combat/blood_" + value + ".png"; + this.imageSprite?.free(); + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/combat/blood_" + value + ".png"), + 0, parseInt(this["amount"], 10) * 32, 32, 32 + ); } } - override getCursor(x: number, y: number) { + override getCursor(_x: number, _y: number) { return "url(" + Paths.sprites + "/cursor/walk.png) 1 3, auto"; } From e2146721d10e1dc1271abdb48aec1d1136606b96 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 8 Feb 2026 22:02:29 +0100 Subject: [PATCH 135/162] use ImageBitmap in ActivityIndicatorSprite --- src/js/stendhal/entity/Corpse.ts | 8 ++++-- src/js/stendhal/entity/PopupInventory.ts | 6 ++--- src/js/stendhal/entity/Sign.ts | 6 +++++ .../sprite/ActivityIndicatorSprite.ts | 25 +++++++++++-------- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index 1e3ae4a28f..1f3f4d9c6d 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -21,9 +21,8 @@ import { Chat } from "../util/Chat"; import { PopupInventory } from "./PopupInventory"; import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; -import { MarauroaUtils } from "marauroa"; -import { marauroa } from "marauroa" +import { marauroa, RPObject, RPZone } from "marauroa" import { stendhal } from "../stendhal"; export class Corpse extends PopupInventory { @@ -179,4 +178,9 @@ export class Corpse extends PopupInventory { private isEmpty() { return !this["content"] || this["content"]._objects.length === 0; } + + override destroy(parent: RPObject|RPZone): void { + this.indicator?.free(); + super.destroy(parent); + } } diff --git a/src/js/stendhal/entity/PopupInventory.ts b/src/js/stendhal/entity/PopupInventory.ts index 8360622b93..5af5364106 100644 --- a/src/js/stendhal/entity/PopupInventory.ts +++ b/src/js/stendhal/entity/PopupInventory.ts @@ -9,7 +9,7 @@ * * ***************************************************************************/ -import { marauroa, RPObject } from "marauroa"; +import { marauroa, RPObject, RPZone } from "marauroa"; import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; @@ -32,9 +32,9 @@ export class PopupInventory extends Entity { // inheriting classes can override } - override destroy(_parent: RPObject) { + override destroy(parent: RPObject|RPZone) { this.closeInventoryWindow(); - super.destroy(_parent); + super.destroy(parent); } /** diff --git a/src/js/stendhal/entity/Sign.ts b/src/js/stendhal/entity/Sign.ts index 2a477bd2a6..2a894829ad 100644 --- a/src/js/stendhal/entity/Sign.ts +++ b/src/js/stendhal/entity/Sign.ts @@ -9,6 +9,7 @@ * * ***************************************************************************/ +import { RPObject, RPZone} from "marauroa"; import { Entity } from "./Entity"; import { ActivityIndicatorSprite } from "../sprite/ActivityIndicatorSprite"; import { RenderingContext2D } from "util/Types"; @@ -58,4 +59,9 @@ export class Sign extends Entity { return "url(" + Paths.sprites + "/cursor/look.png) 1 3, auto"; } + override destroy(parent: RPObject|RPZone): void { + this.indicator?.free(); + super.destroy(parent); + } + } diff --git a/src/js/stendhal/sprite/ActivityIndicatorSprite.ts b/src/js/stendhal/sprite/ActivityIndicatorSprite.ts index 0ab17759ed..0f1a2bf67f 100644 --- a/src/js/stendhal/sprite/ActivityIndicatorSprite.ts +++ b/src/js/stendhal/sprite/ActivityIndicatorSprite.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright © 2024 - Faiumoni e. V. * + * Copyright © 2024-2026 - Faiumoni e. V. * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -11,9 +11,10 @@ import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; -import { singletons } from "../SingletonRepo"; import { stendhal } from "../stendhal"; +import { ImageRef } from "./image/ImageRef"; +import { images } from "./image/ImageManager"; /** @@ -21,7 +22,7 @@ import { stendhal } from "../stendhal"; */ export class ActivityIndicatorSprite { - private static readonly img = singletons.getSpriteStore().get(Paths.sprites + "/ideas/activity.png"); + private imageRef: ImageRef; private frameIdx = 0; private lastFrameUpdate = 0; @@ -30,13 +31,12 @@ export class ActivityIndicatorSprite { constructor() { this.animate = stendhal.config.getBoolean("activity-indicator.animate"); + this.imageRef = images.load(Paths.sprites + "/ideas/activity.png"); } /** * Draws an indicator. * - * TODO: add option enable/disable animation - * * @param dx * Pixel position where parent object is drawn on X axis. * @param dy @@ -45,22 +45,23 @@ export class ActivityIndicatorSprite { * Pixel width of parent object. */ public draw(ctx: RenderingContext2D, dx: number, dy: number, width: number) { - if (!ActivityIndicatorSprite.img.complete) { + let image = this.imageRef.image; + if (!image) { return; } // NOTE: indicator image should be square - const dim = ActivityIndicatorSprite.img.height; + let dim = image.height; if (this.animate) { - const cycleStart = Date.now(); + let cycleStart = Date.now(); if (this.lastFrameUpdate == 0) { this.lastFrameUpdate = cycleStart; } if (cycleStart - this.lastFrameUpdate > 150) { this.frameIdx++; - if ((this.frameIdx + 1) * dim >= ActivityIndicatorSprite.img.width) { + if ((this.frameIdx + 1) * dim >= image.width) { this.frameIdx = 0; } this.lastFrameUpdate = cycleStart; @@ -68,6 +69,10 @@ export class ActivityIndicatorSprite { } // draw in upper-right of target area - ctx.drawImage(ActivityIndicatorSprite.img, dim * this.frameIdx, 0, dim, dim, dx+width-dim, dy, dim, dim); + ctx.drawImage(image, dim * this.frameIdx, 0, dim, dim, dx+width-dim, dy, dim, dim); + } + + free() { + this.imageRef.free(); } } From 581ffc886a0563272613f9de15947931f02bc4e6 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 9 Feb 2026 00:32:54 +0100 Subject: [PATCH 136/162] use ImageBitmap and ImageManager --- src/js/stendhal/entity/Sign.ts | 30 ++++++++++++++--------- src/js/stendhal/entity/UseableEntity.ts | 23 +++++++----------- src/js/stendhal/entity/VisibleEntity.ts | 32 +++++++++++++++---------- src/js/stendhal/entity/WalkBlocker.ts | 2 -- 4 files changed, 47 insertions(+), 40 deletions(-) diff --git a/src/js/stendhal/entity/Sign.ts b/src/js/stendhal/entity/Sign.ts index 2a894829ad..f9429c12ba 100644 --- a/src/js/stendhal/entity/Sign.ts +++ b/src/js/stendhal/entity/Sign.ts @@ -17,33 +17,41 @@ import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; import { stendhal } from "../stendhal"; +import { images } from "sprite/image/ImageManager"; +import { ImageSprite } from "sprite/image/ImageSprite"; export class Sign extends Entity { override zIndex = 5000; private indicator?: ActivityIndicatorSprite; - - constructor() { - super(); - this["class"] = "default"; + override init() { + super.init(); + if (!this.imageSprite) { + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/signs/" + "default" + ".png"), + 0, 0, 32, 32 + ); + } } override set(key: string, value: object) { super.set(key, value); if (key === "activity-indicator" && stendhal.config.getBoolean("activity-indicator")) { this.indicator = new ActivityIndicatorSprite(); + } else if (key === "class") { + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/signs/" + this["class"] + ".png"), + 0, 0, 32, 32 + ); } } override draw(ctx: RenderingContext2D) { - if (!this.imagePath) { - this.imagePath = Paths.sprites + "/signs/" + this["class"] + ".png"; - } - var image = singletons.getSpriteStore().get(this.imagePath); - if (image.height) { - var localX = this["x"] * 32; - var localY = this["y"] * 32; + let image = this.imageSprite?.imageRef?.image; + let localX = this["x"] * 32; + let localY = this["y"] * 32; + if (image) { ctx.drawImage(image, localX, localY); if (this.indicator) { this.indicator.draw(ctx, localX, localY, image.width); diff --git a/src/js/stendhal/entity/UseableEntity.ts b/src/js/stendhal/entity/UseableEntity.ts index edfb2b11e9..96883af230 100644 --- a/src/js/stendhal/entity/UseableEntity.ts +++ b/src/js/stendhal/entity/UseableEntity.ts @@ -9,33 +9,26 @@ * * ***************************************************************************/ -import { stendhal } from "../stendhal"; - import { Entity } from "./Entity"; import { MenuItem } from "../action/MenuItem"; import { Paths } from "../data/Paths"; +import { ImageSprite } from "sprite/image/ImageSprite"; +import { images } from "sprite/image/ImageManager"; export class UseableEntity extends Entity { override zIndex = 3000 action = "use"; - constructor() { - super(); - this.sprite = { - height: 32, - width: 32 - }; - } - override set(key: string, value: any) { super.set(key, value); if (key === "class" || key === "name") { - this.sprite.filename = Paths.sprites + "/" - + this["class"] + "/" + this["_name"] + ".png"; - } - if (key === "state") { - this.sprite.offsetY = this["state"] * 32; + let filename = Paths.sprites + "/" + this["class"] + "/" + this["_name"] + ".png"; + let state = this["state"] * 32 || 0; + this.imageSprite?.free(); + this.imageSprite = new ImageSprite(images.load(filename), 0, state, 32, 32); + } else if (key === "state" && this.imageSprite) { + this.imageSprite.offsetY = this["state"] * 32; } } diff --git a/src/js/stendhal/entity/VisibleEntity.ts b/src/js/stendhal/entity/VisibleEntity.ts index eca1fa2a04..dff542145a 100644 --- a/src/js/stendhal/entity/VisibleEntity.ts +++ b/src/js/stendhal/entity/VisibleEntity.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -9,10 +9,10 @@ * * ***************************************************************************/ +import { images } from "sprite/image/ImageManager"; import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; - -import { stendhal } from "../stendhal"; +import { ImageSprite } from "sprite/image/ImageSprite"; export class VisibleEntity extends Entity { @@ -20,21 +20,29 @@ export class VisibleEntity extends Entity { constructor() { super(); - this.sprite = { - height: 32, - width: 32 - }; + } + + override init(): void { + let filename = Paths.sprites + "/" + + (this["class"] || "") + "/" + + (this["subclass"] || "") + "/" + + (this["_name"] || "") + ".png"; + let state = this["state"] * 32 || 0; + this.imageSprite = new ImageSprite(images.load(filename), 0, state, 32, 32); } override set(key: string, value: any) { super.set(key, value); if (key === "class" || key === "subclass" || key === "_name") { - this.sprite.filename = Paths.sprites + "/" - + (this["class"] || "") + "/" - + (this["subclass"] || "") + "/" - + (this["_name"] || "") + ".png"; + // if this was already initialized, create a new ImageSprite + if (this.imageSprite) { + this.imageSprite.free(); + this.init(); + } } else if (key === "state") { - this.sprite.offsetY = value * 32; + if (this.imageSprite) { + this.imageSprite.offsetY = value * 32; + } } } diff --git a/src/js/stendhal/entity/WalkBlocker.ts b/src/js/stendhal/entity/WalkBlocker.ts index d92d2fb107..72654ecc64 100644 --- a/src/js/stendhal/entity/WalkBlocker.ts +++ b/src/js/stendhal/entity/WalkBlocker.ts @@ -12,8 +12,6 @@ import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; -import { stendhal } from "../stendhal"; - export class WalkBlocker extends Entity { override zIndex = 3000; From fcadfcdbd3c8f2dc5db64215247964be68a3d61e Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 9 Feb 2026 22:28:39 +0100 Subject: [PATCH 137/162] use ImageBitmap --- src/js/stendhal/entity/Food.ts | 24 +++++----- src/js/stendhal/entity/GameBoard.ts | 15 +++---- src/js/stendhal/entity/Gate.ts | 45 ++++++++++++------- .../stendhal/entity/GrowingEntitySpawner.ts | 44 +++++++++--------- 4 files changed, 68 insertions(+), 60 deletions(-) diff --git a/src/js/stendhal/entity/Food.ts b/src/js/stendhal/entity/Food.ts index c1f1ab0fdb..0936841396 100644 --- a/src/js/stendhal/entity/Food.ts +++ b/src/js/stendhal/entity/Food.ts @@ -9,36 +9,34 @@ * * ***************************************************************************/ -import { RenderingContext2D } from "util/Types"; import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; -import { singletons } from "../SingletonRepo"; import { marauroa } from "marauroa" +import { ImageSprite } from "sprite/image/ImageSprite"; +import { images } from "sprite/image/ImageManager"; export class Food extends Entity { override zIndex = 5000; + override init() { + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/food.png"), + 0, this["amount"] * 32, 32, 32); + } + override set(key: string, value: any) { super.set(key, value); if (key === "amount") { - this._amount = parseInt(value, 10); + if (this.imageSprite) { + this.imageSprite.offsetY = this["amount"] * 32; + } } // TODO: play sound effect } - override draw(ctx: RenderingContext2D) { - var image = singletons.getSpriteStore().get(Paths.sprites + "/food.png"); - if (image.height) { - var localX = this["x"] * 32; - var localY = this["y"] * 32; - var offset = this._amount * 32; - ctx.drawImage(image, 0, offset, 32, 32, localX, localY, 32, 32); - } - } - override onclick(_x: number, _y: number) { var action = { "type": "look", diff --git a/src/js/stendhal/entity/GameBoard.ts b/src/js/stendhal/entity/GameBoard.ts index 1e87563520..487678f1e3 100644 --- a/src/js/stendhal/entity/GameBoard.ts +++ b/src/js/stendhal/entity/GameBoard.ts @@ -13,25 +13,20 @@ import { Paths } from "../data/Paths"; import { Entity } from "./Entity"; import { stendhal } from "../stendhal"; +import { ImageSprite } from "sprite/image/ImageSprite"; +import { images } from "sprite/image/ImageManager"; export class GameBoard extends Entity { override minimapShow = false; override zIndex = 100; - constructor() { - super(); - this.sprite = { - height: 32 * 3, - width: 32 * 3 - }; - } - override set(key: string, value: any) { super.set(key, value); if (key === "class") { - this.sprite.filename = Paths.sprites + "/gameboard/" - + this["class"] + ".png"; + let filename = Paths.sprites + "/gameboard/" + this["class"] + ".png"; + this.imageSprite?.free(); + this.imageSprite = new ImageSprite(images.load(filename), 0, 0, 3*32, 3*32); } } diff --git a/src/js/stendhal/entity/Gate.ts b/src/js/stendhal/entity/Gate.ts index e112ec413e..e151c10c6a 100644 --- a/src/js/stendhal/entity/Gate.ts +++ b/src/js/stendhal/entity/Gate.ts @@ -13,28 +13,41 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Entity } from "./Entity"; import { Paths } from "../data/Paths"; -import { singletons } from "../SingletonRepo"; import { marauroa } from "marauroa" +import { images } from "sprite/image/ImageManager"; +import { ImageSprite } from "sprite/image/ImageSprite"; export class Gate extends Entity { override zIndex = 5000; + private locked = false; + + override init() { + this.imageSprite?.free(); + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/doors/" + this["image"] + "_" + this["orientation"] + ".png"), + 0, 0, 0, 0); + } override set(key: string, value: any) { super.set(key, value); if (key === "resistance") { - this["locked"] = parseInt(value, 10) !== 0; + this.locked = parseInt(value, 10) !== 0; } else if (key === "image" || key === "orientation") { - // Force re-evaluation of the sprite - delete this["_image"]; + if (this.imageSprite) { + this.imageSprite?.free(); + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/doors/" + this["image"] + "_" + this["orientation"] + ".png"), + 0, 0, 0, 0); + } } } override buildActions(list: MenuItem[]) { var id = this["id"]; list.push({ - title: (this["locked"]) ? "Open" : "Close", + title: (this.locked) ? "Open" : "Close", action: function(_entity: Entity) { var action = { "type": "use", @@ -47,19 +60,17 @@ export class Gate extends Entity { } override draw(ctx: RenderingContext2D) { - if (this._image == undefined) { - var filename = Paths.sprites + "/doors/" + this["image"] + "_" + this["orientation"] + ".png"; - this._image = singletons.getSpriteStore().get(filename); - } - if (this._image.height) { - var xOffset = -32 * Math.floor(this._image.width / 32 / 2); - var height = this._image.height / 2; - var yOffset = -32 * Math.floor(height / 32 / 2); - var localX = this["_x"] * 32 + xOffset; - var localY = this["_y"] * 32 + yOffset; - var yStart = (this["locked"]) ? height : 0; - ctx.drawImage(this._image, 0, yStart, this._image.width, height, localX, localY, this._image.width, height); + let image = this.imageSprite?.imageRef?.image; + if (!image) { + return; } + let xOffset = -32 * Math.floor(image.width / 32 / 2); + let height = image.height / 2; + let yOffset = -32 * Math.floor(height / 32 / 2); + let localX = this["_x"] * 32 + xOffset; + let localY = this["_y"] * 32 + yOffset; + let yStart = (this.locked) ? height : 0; + ctx.drawImage(image, 0, yStart, image.width, height, localX, localY, image.width, height); } override isVisibleToAction(_filter: boolean) { diff --git a/src/js/stendhal/entity/GrowingEntitySpawner.ts b/src/js/stendhal/entity/GrowingEntitySpawner.ts index 2bc598925a..4f5acf2ce4 100644 --- a/src/js/stendhal/entity/GrowingEntitySpawner.ts +++ b/src/js/stendhal/entity/GrowingEntitySpawner.ts @@ -16,11 +16,26 @@ import { Paths } from "../data/Paths"; import { singletons } from "../SingletonRepo"; import { marauroa } from "marauroa" +import { ImageSprite } from "sprite/image/ImageSprite"; +import { images } from "sprite/image/ImageManager"; export class GrowingEntitySpawner extends Entity { override zIndex = 3000; + + override set(key: string, value: any) { + super.set(key, value); + if (key === "class") { + this.imageSprite?.free(); + let className = value.replace(" ", "_"); + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/" + className + ".png"), + 0, 0, 0, 0); + } + } + + /** * is this entity visible to a specific action * @@ -50,30 +65,19 @@ export class GrowingEntitySpawner extends Entity { marauroa.clientFramework.sendAction(action); } - /** - * draw RPEntities - */ override draw(ctx: RenderingContext2D) { - var localX = this["x"] * 32; - var localY = this["y"] * 32; - - // FIXME: - // temporary fix, problem lies higher up - // appears to only affect button_mushroom_grower - // could be issue in marauroa - let class_name = this["class"]; - if (class_name.includes(" ")) { - class_name = class_name.replace(" ", "_"); + let localX = this["x"] * 32; + let localY = this["y"] * 32; + let image = this.imageSprite?.imageRef?.image; + if (!image) { + return; } - var image = singletons.getSpriteStore().get(Paths.sprites + "/" + class_name + ".png"); - if (image.height) { // image.complete is true on missing image files - var count = parseInt(this["max_ripeness"], 10) + 1; - var drawHeight = image.height / count; - var yRow = this["ripeness"]; - ctx.drawImage(image, 0, yRow * drawHeight, image.width, drawHeight, + let count = parseInt(this["max_ripeness"], 10) + 1; + let drawHeight = image.height / count; + let yRow = this["ripeness"]; + ctx.drawImage(image, 0, yRow * drawHeight, image.width, drawHeight, localX, localY - drawHeight + 32, image.width, drawHeight); - } } override getCursor(_x: number, _y: number) { From 03654e445974623054de9d0869b759f9f9d8b81a Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 9 Feb 2026 22:32:04 +0100 Subject: [PATCH 138/162] prevent path traversal --- src/js/stendhal/sprite/image/ImageManager.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/js/stendhal/sprite/image/ImageManager.ts b/src/js/stendhal/sprite/image/ImageManager.ts index 8781ef95d6..8c8ec26348 100644 --- a/src/js/stendhal/sprite/image/ImageManager.ts +++ b/src/js/stendhal/sprite/image/ImageManager.ts @@ -18,6 +18,9 @@ export class ImageManager { images = new Map(); load(filename: string, filter?: string, param?: number): ImageRef { + if (filename.indexOf("..") > -1) { + throw new Error("Invalid filename: " + filename); + } let key = filename + "!" + filter + "!" + param; let imageRef = this.images.get(key); if (!imageRef) { From 1f9242ae6f2add3fe5a1559ee0539d859c52393f Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 10 Feb 2026 23:24:15 +0100 Subject: [PATCH 139/162] converted to image bitmap --- src/js/stendhal/entity/Chest.ts | 28 +++++++++-------------- src/js/stendhal/entity/Corpse.ts | 39 +++++++++++++++----------------- src/js/stendhal/entity/Door.ts | 39 +++++++++++++++++++++----------- 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/src/js/stendhal/entity/Chest.ts b/src/js/stendhal/entity/Chest.ts index ca6ad9aeea..59b4438682 100644 --- a/src/js/stendhal/entity/Chest.ts +++ b/src/js/stendhal/entity/Chest.ts @@ -24,20 +24,8 @@ import { Paths } from "../data/Paths"; import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; import { Entity } from "./Entity"; - - -let OPEN_SPRITE = { - filename: Paths.sprites + "/chest.png", - height: 32, - width: 32, - offsetY: 32 -}; - -let CLOSED_SPRITE = { - filename: Paths.sprites + "/chest.png", - height: 32, - width: 32 -}; +import { ImageSprite } from "sprite/image/ImageSprite"; +import { images } from "sprite/image/ImageManager"; export class Chest extends PopupInventory { @@ -45,13 +33,19 @@ export class Chest extends PopupInventory { override minimapStyle = Color.CHEST; override zIndex = 5000; - sprite = CLOSED_SPRITE; open = false; + constructor() { + super(); + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/chest.png"), + 0, 0, 32, 32); + } + override set(key: string, value: any) { super.set(key, value); if (key === "open") { - this.sprite = OPEN_SPRITE; + this.imageSprite!.offsetY = 32; this.open = true; } if (this.isNextTo(marauroa.me as Entity)) { @@ -62,7 +56,7 @@ export class Chest extends PopupInventory { override unset(key: string) { super.unset(key); if (key === "open") { - this.sprite = CLOSED_SPRITE; + this.imageSprite!.offsetY = 0; this.open = false; if (this.inventory && this.inventory.isOpen()) { this.inventory.close(); diff --git a/src/js/stendhal/entity/Corpse.ts b/src/js/stendhal/entity/Corpse.ts index 1f3f4d9c6d..ce63da253e 100644 --- a/src/js/stendhal/entity/Corpse.ts +++ b/src/js/stendhal/entity/Corpse.ts @@ -24,6 +24,8 @@ import { singletons } from "../SingletonRepo"; import { marauroa, RPObject, RPZone } from "marauroa" import { stendhal } from "../stendhal"; +import { images } from "sprite/image/ImageManager"; +import { ImageSprite } from "sprite/image/ImageSprite"; export class Corpse extends PopupInventory { @@ -44,18 +46,21 @@ export class Corpse extends PopupInventory { override set(key: string, value: any) { super.set(key, value); - this.sprite = this.sprite || {}; - const bloodEnabled = stendhal.config.getBoolean("effect.blood"); - + let bloodEnabled = stendhal.config.getBoolean("effect.blood"); if (bloodEnabled && (key === "image")) { - this.sprite.filename = Paths.sprites + "/corpse/" + value + ".png"; + this.imageSprite?.free(); + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/corpse/" + value + ".png")); } else if (!bloodEnabled && (key === "harmless_image")) { - this.sprite.filename = Paths.sprites + "/corpse/" + value + ".png"; + this.imageSprite?.free(); + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/corpse/" + value + ".png")); } } override draw(ctx: RenderingContext2D) { - if (!this.sprite) { + let image = this.imageSprite?.imageRef?.image; + if (!image) { return; } super.draw(ctx); @@ -63,21 +68,13 @@ export class Corpse extends PopupInventory { if (this.indicator && !this.isEmpty()) { const tileW = stendhal.ui.gamewindow.targetTileWidth; const tileH = stendhal.ui.gamewindow.targetTileHeight; - if (this.sprite.width == undefined || this.sprite.height == undefined) { - const image = singletons.getSpriteStore().get(this.sprite.filename); - if (image.complete) { - this.sprite.width = image.width < tileW ? tileW : image.width; - this.sprite.height = image.height < tileH ? tileH : image.height; - } - return; - } - - const offsetX = Math.floor((this["width"] * tileW - this.sprite.width) / 2); - const offsetY = Math.floor((this["height"] * tileH - this.sprite.height) / 2); - const dx = this["x"] * tileW + offsetX; - const dy = this["y"] * tileH + offsetY; - - this.indicator.draw(ctx, dx, dy, this.sprite.width); + let width = image.width < tileW ? tileW : image.width; + let height = image.height < tileH ? tileH : image.height; + let offsetX = Math.floor((this["width"] * tileW - width) / 2); + let offsetY = Math.floor((this["height"] * tileH - height) / 2); + let dx = this["x"] * tileW + offsetX; + let dy = this["y"] * tileH + offsetY; + this.indicator.draw(ctx, dx, dy, width); } } diff --git a/src/js/stendhal/entity/Door.ts b/src/js/stendhal/entity/Door.ts index c677e4dbe4..90f98337d9 100644 --- a/src/js/stendhal/entity/Door.ts +++ b/src/js/stendhal/entity/Door.ts @@ -13,28 +13,41 @@ import { RenderingContext2D } from "util/Types"; import { MenuItem } from "../action/MenuItem"; import { Portal } from "./Portal"; import { Paths } from "../data/Paths"; -import { singletons } from "../SingletonRepo"; +import { ImageSprite } from "sprite/image/ImageSprite"; +import { images } from "sprite/image/ImageManager"; export class Door extends Portal { override zIndex = 5000; - override draw(ctx: RenderingContext2D) { - let imagePath = Paths.sprites + "/doors/" + this["class"] + ".png"; - let image = singletons.getSpriteStore().get(imagePath); - if (image.height) { - let height = image.height / 2; - let x = (this["x"] * 32) - ((image.width - 32) / 2); - let y = (this["y"] * 32) - ((height - 32) / 2); - - var offsetY = height; - if (this["open"] === "") { - offsetY = 0; + override set(key: string, value: any) { + super.set(key, value); + if (key === "class") { + if (this.imageSprite) { + this.imageSprite?.free(); + this.imageSprite = new ImageSprite( + images.load(Paths.sprites + "/doors/" + value + ".png"), + 0, 0, 0, 0); } - ctx.drawImage(image, 0, offsetY, image.width, height, x, y, image.width, height); } } + override draw(ctx: RenderingContext2D) { + let image = this.imageSprite?.imageRef?.image; + if (!image) { + return; + } + let height = image.height / 2; + let x = (this["x"] * 32) - ((image.width - 32) / 2); + let y = (this["y"] * 32) - ((height - 32) / 2); + + let offsetY = height; + if (this["open"] === "") { + offsetY = 0; + } + ctx.drawImage(image, 0, offsetY, image.width, height, x, y, image.width, height); + } + override buildActions(list: MenuItem[]) { list.push({ title: "Look", From 2022b28b766eddda1a555aefc00ee78279bcd3a6 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Thu, 12 Feb 2026 01:42:32 +0100 Subject: [PATCH 140/162] access OutfitStore singleton directly --- src/js/stendhal/Client.ts | 4 ++-- src/js/stendhal/SingletonRepo.ts | 4 ---- src/js/stendhal/data/Outfit.ts | 7 ++++--- src/js/stendhal/data/OutfitStore.ts | 2 +- src/js/stendhal/entity/RPEntity.ts | 12 +++++++----- src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts | 5 +++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index 7056378639..6b4618a3c7 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -38,6 +38,7 @@ import { Chat } from "./util/Chat"; import { DialogHandler } from "./util/DialogHandler"; import { Globals } from "./util/Globals"; import { TileMap } from "data/TileMap"; +import { OutfitStore } from "data/OutfitStore"; /** @@ -116,7 +117,6 @@ export class Client { stendhal.data.cstatus = singletons.getCStatus(); stendhal.data.cstatus.init(); stendhal.data.group = singletons.getGroupManager(); - stendhal.data.outfit = singletons.getOutfitStore(); stendhal.data.sprites = singletons.getSpriteStore(); // online players stendhal.players = []; @@ -179,7 +179,7 @@ export class Client { // initialize emoji data singletons.getEmojiStore().init(); // initialize outfit data - stendhal.data.outfit.init(); + OutfitStore.get().init(); new DesktopUserInterfaceFactory().create(); diff --git a/src/js/stendhal/SingletonRepo.ts b/src/js/stendhal/SingletonRepo.ts index 9af8610851..0c2caa7aee 100644 --- a/src/js/stendhal/SingletonRepo.ts +++ b/src/js/stendhal/SingletonRepo.ts @@ -115,10 +115,6 @@ export class SingletonRepo { return LoopedSoundSourceManager.get(); } - static getOutfitStore(): OutfitStore { - return OutfitStore.get(); - } - static getPaths(): typeof Paths { return Paths; } diff --git a/src/js/stendhal/data/Outfit.ts b/src/js/stendhal/data/Outfit.ts index 9171566a58..6052266214 100644 --- a/src/js/stendhal/data/Outfit.ts +++ b/src/js/stendhal/data/Outfit.ts @@ -17,6 +17,7 @@ import { Paths } from "./Paths"; import { stendhal } from "../stendhal"; import { ImageMetadata } from "sprite/image/ImageMetadata"; import { MultilayerImageLoader } from "sprite/image/MultilayerImageLoader"; +import { OutfitStore } from "./OutfitStore"; /** @@ -115,7 +116,7 @@ export class Outfit { public getLayers(): Pair[] { const layers: Pair[] = []; // only include valid layers - for (const name of stendhal.data.outfit.getLayerNames()) { + for (const name of OutfitStore.get().getLayerNames()) { let index = this.layers[name]; if (index != undefined) { layers.push(new Pair(name, index)); @@ -153,7 +154,7 @@ export class Outfit { * Color value or `undefined`. */ public getLayerColor(name: string): number|undefined { - if (stendhal.data.outfit.isSkinLayer(name)) { + if (OutfitStore.get().isSkinLayer(name)) { name = "skin"; } return this.coloring && name in this.coloring ? this.coloring[name] : undefined; @@ -200,7 +201,7 @@ export class Outfit { let parts: ImageMetadata[] = []; let outfitLayers = this.getLayers(); const detailIndex = this.getLayerIndex("detail") || 0; - if (stendhal.data.outfit.detailHasRearLayer(detailIndex)) { + if (OutfitStore.get().detailHasRearLayer(detailIndex)) { outfitLayers = [new Pair("detail-rear", detailIndex), ...outfitLayers]; } for (const l of outfitLayers) { diff --git a/src/js/stendhal/data/OutfitStore.ts b/src/js/stendhal/data/OutfitStore.ts index 8c4bb5eb8b..aaa22018f6 100644 --- a/src/js/stendhal/data/OutfitStore.ts +++ b/src/js/stendhal/data/OutfitStore.ts @@ -25,7 +25,7 @@ export class OutfitStore { // player pickable layers - private count: {[key: string]: number} = { + public readonly count: {[key: string]: number} = { "hat": 19, "hair": 57, "mask": 9, diff --git a/src/js/stendhal/entity/RPEntity.ts b/src/js/stendhal/entity/RPEntity.ts index 62324d85f0..6dff162c26 100644 --- a/src/js/stendhal/entity/RPEntity.ts +++ b/src/js/stendhal/entity/RPEntity.ts @@ -35,6 +35,7 @@ import { RangedAttackSprite } from "../sprite/action/RangedAttackSprite"; import { ImageWithDimensions } from "data/ImageWithDimensions"; import { RenderingContext2D } from "util/Types"; import { Paths } from "../data/Paths"; +import { OutfitStore } from "data/OutfitStore"; var HEALTH_BAR_HEIGHT = 6; @@ -221,7 +222,7 @@ export class RPEntity extends ActiveEntity { } drawMultipartOutfit(ctx: RenderingContext2D) { - const store = singletons.getOutfitStore(); + const store = OutfitStore.get(); // layers in draw order var layers = store.getLayerNames(); @@ -257,13 +258,13 @@ export class RPEntity extends ActiveEntity { if (this.octx) { this.octx.clearRect(0, 0, this.octx.canvas.width, this.octx.canvas.height); } - if (stendhal.data.outfit.detailHasRearLayer(outfit["detail"])) { + if (store.detailHasRearLayer(outfit["detail"])) { layers.splice(0, 0, "detail-rear"); outfit["detail-rear"] = outfit["detail"]; } for (const layer of layers) { // hair is not drawn under certain hats/helmets - if (layer == "hair" && !stendhal.data.outfit.drawHair(outfit["hat"])) { + if (layer == "hair" && !store.drawHair(outfit["hat"])) { continue; } @@ -302,9 +303,10 @@ export class RPEntity extends ActiveEntity { n = "0" + index; } + let store = OutfitStore.get(); if (part === "body" && index < 3 && stendhal.config.getBoolean("effect.no-nude")) { n += "-nonude"; - } else if (part === "dress" && stendhal.data.outfit.drawBustyDress(index, body)) { + } else if (part === "dress" && store.drawBustyDress(index, body)) { n += "b"; } else if (part.endsWith("-rear")) { n += "-rear"; @@ -314,7 +316,7 @@ export class RPEntity extends ActiveEntity { const filename = Paths.sprites + "/outfit/" + part + "/" + n + ".png"; const colors = this["outfit_colors"]; let colorname; - if (stendhal.data.outfit.isSkinLayer(part)) { + if (store.isSkinLayer(part)) { colorname = "skin"; } else { colorname = part; diff --git a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts index fc234aa515..b188b1d420 100644 --- a/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts +++ b/src/js/stendhal/ui/dialog/outfit/OutfitDialog.ts @@ -21,6 +21,7 @@ import { OutfitPreviewComponent } from "../../component/OutfitPreviewComponent"; import { marauroa } from "marauroa" import { stendhal } from "../../../stendhal"; +import { OutfitStore } from "data/OutfitStore"; /** @@ -194,7 +195,7 @@ export class OutfitDialog extends DialogContentComponent { index = minIndex; } - const selector = new OutfitPartSelector(part, index, minIndex, stendhal.data.outfit.count[part] - 1, () => { + const selector = new OutfitPartSelector(part, index, minIndex, OutfitStore.get().count[part] - 1, () => { this.drawComposite(); }); @@ -217,7 +218,7 @@ export class OutfitDialog extends DialogContentComponent { initialColorValue(part: string) { const colors = marauroa.me["outfit_colors"]; if (colors != null) { - const colorName = stendhal.data.outfit.isSkinLayer(part) ? "skin" : part; + const colorName = OutfitStore.get().isSkinLayer(part) ? "skin" : part; let layer_color = colors[colorName + "_orig"]; if (layer_color === undefined) { From d350c2b4946bb2e74bb8f5bd68578bb55dd70747 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Thu, 12 Feb 2026 21:27:15 +0100 Subject: [PATCH 141/162] invoke singleton get-methods instead of SingletonRepo --- src/js/stendhal/Client.ts | 4 +-- src/js/stendhal/SingletonRepo.ts | 11 ------- src/js/stendhal/ui/ViewPort.ts | 32 +++++++++++-------- .../stendhal/ui/component/ChatLogComponent.ts | 10 +++--- .../component/ItemContainerImplementation.ts | 26 ++++++++------- 5 files changed, 40 insertions(+), 43 deletions(-) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index 6b4618a3c7..9b433ec0a5 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -39,6 +39,7 @@ import { DialogHandler } from "./util/DialogHandler"; import { Globals } from "./util/Globals"; import { TileMap } from "data/TileMap"; import { OutfitStore } from "data/OutfitStore"; +import { TileStore } from "data/TileStore"; /** @@ -140,7 +141,6 @@ export class Client { stendhal.ui = stendhal.ui || {}; stendhal.ui.equip = singletons.getInventory(); stendhal.ui.html = singletons.getHTMLManager(); - stendhal.ui.touch = singletons.getTouchHandler(); stendhal.ui.viewport = singletons.getViewPort(); // alias for backward-compat until changed in all source stendhal.ui.gamewindow = stendhal.ui.viewport; @@ -175,7 +175,7 @@ export class Client { singletons.getEventRegistry().init(); // initialize tileset animation data - singletons.getTileStore().init(); + TileStore.get().init(); // initialize emoji data singletons.getEmojiStore().init(); // initialize outfit data diff --git a/src/js/stendhal/SingletonRepo.ts b/src/js/stendhal/SingletonRepo.ts index 0c2caa7aee..00f9ca7078 100644 --- a/src/js/stendhal/SingletonRepo.ts +++ b/src/js/stendhal/SingletonRepo.ts @@ -26,10 +26,8 @@ import { CStatus } from "./data/CStatus"; import { CacheManager } from "./data/CacheManager"; import { EmojiStore } from "./data/EmojiStore"; import { GroupManager } from "./data/GroupManager"; -import { OutfitStore } from "./data/OutfitStore"; import { Paths } from "./data/Paths"; import { SpriteStore, store } from "./data/SpriteStore"; -import { TileStore } from "./data/TileStore"; import { LoopedSoundSourceManager } from "./data/sound/LoopedSoundSourceManager"; import { SoundManager } from "./data/sound/SoundManager"; @@ -40,7 +38,6 @@ import { HeldObjectManager } from "./ui/HeldObject"; import { HTMLManager } from "./ui/HTMLManager"; import { Inventory } from "./ui/Inventory"; import { SoftwareJoystickController } from "./ui/SoftwareJoystickController"; -import { TouchHandler } from "./ui/TouchHandler"; import { UIUpdateObserver } from "./ui/UIUpdateObserver"; import { ViewPort } from "./ui/ViewPort"; @@ -135,14 +132,6 @@ export class SingletonRepo { return store; } - static getTileStore(): TileStore { - return TileStore.get(); - } - - static getTouchHandler(): TouchHandler { - return TouchHandler.get(); - } - static getUIUpdateObserver(): UIUpdateObserver { return UIUpdateObserver.get(); } diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index 8cc35ad638..b6a4c480e9 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -35,6 +35,7 @@ import { Canvas, RenderingContext2D } from "util/Types"; import { Debug } from "../util/Debug"; import { TileMap } from "data/TileMap"; import { HTMLImageElementUtil } from "sprite/image/HTMLImageElementUtil"; +import { TouchHandler } from "./TouchHandler"; /** @@ -86,6 +87,8 @@ export class ViewPort { /** Singleton instance. */ private static instance: ViewPort; + private touchHandler = TouchHandler.get(); + /** * Retrieves singleton instance. */ @@ -496,13 +499,14 @@ export class ViewPort { const mHandle: any = {}; mHandle._onMouseDown = function(e: MouseEvent|TouchEvent) { + let touchHandler = TouchHandler.get(); var pos = stendhal.ui.html.extractPosition(e); - if (stendhal.ui.touch.isTouchEvent(e)) { - if (stendhal.ui.touch.holding()) { + if (touchHandler.isTouchEvent(e)) { + if (touchHandler.holding()) { // prevent default viewport action when item is "held" return; } - stendhal.ui.touch.onTouchStart(pos.pageX, pos.pageY); + touchHandler.onTouchStart(pos.pageX, pos.pageY); } if (stendhal.ui.globalpopup) { stendhal.ui.globalpopup.close(); @@ -544,12 +548,12 @@ export class ViewPort { } mHandle.onMouseUp = function(e: MouseEvent|TouchEvent) { - const is_touch = stendhal.ui.touch.isTouchEvent(e); + const is_touch = this.touchHandler.isTouchEvent(e); if (is_touch) { - stendhal.ui.touch.onTouchEnd(e); + this.touchHandler.onTouchEnd(e); } var pos = stendhal.ui.html.extractPosition(e); - const long_touch = is_touch && stendhal.ui.touch.isLongTouch(e); + const long_touch = is_touch && this.touchHandler.isLongTouch(e); if ((e instanceof MouseEvent && mHandle.isRightClick(e)) || long_touch) { if (entity != stendhal.zone.ground) { const append: any[] = []; @@ -570,7 +574,7 @@ export class ViewPort { } mHandle.onDrag = function(e: MouseEvent) { - if (stendhal.ui.touch.isTouchEvent(e)) { + if (this.touchHandler.isTouchEvent(e)) { stendhal.ui.gamewindow.onDragStart(e); } @@ -675,9 +679,9 @@ export class ViewPort { return; } - if (stendhal.ui.touch.isTouchEvent(e)) { + if (this.touchHandler.isTouchEvent(e)) { singletons.getHeldObjectManager().set(heldObject, img, new Point(pos.pageX, pos.pageY)); - stendhal.ui.touch.setHolding(true); + this.touchHandler.setHolding(true); } else { stendhal.ui.heldObject = heldObject; } @@ -741,7 +745,7 @@ export class ViewPort { // item was dropped stendhal.ui.heldObject = undefined; - const touch_held = stendhal.ui.touch.holding() && quantity > 1; + const touch_held = this.touchHandler.holding() && quantity > 1; // if ctrl is pressed or holding stackable item from touch event, we ask for the quantity // NOTE: don't create selector if touch source is ground if (e.ctrlKey || (touch_held && sourceSlot !== targetSlot)) { @@ -760,11 +764,11 @@ export class ViewPort { * This is a workaround until it's figured out how to make it work using the same methods as mouse event. */ onTouchEnd(e: TouchEvent) { - stendhal.ui.touch.onTouchEnd(); + this.touchHandler.onTouchEnd(); stendhal.ui.gamewindow.onDrop(e); - if (stendhal.ui.touch.holding()) { - stendhal.ui.touch.setHolding(false); - stendhal.ui.touch.unsetOrigin(); + if (this.touchHandler.holding()) { + this.touchHandler.setHolding(false); + this.touchHandler.unsetOrigin(); } // execute here because "touchend" event propagation is cancelled on the veiwport Client.handleClickIndicator(e); diff --git a/src/js/stendhal/ui/component/ChatLogComponent.ts b/src/js/stendhal/ui/component/ChatLogComponent.ts index 45dbdba79b..c02a3c46c2 100644 --- a/src/js/stendhal/ui/component/ChatLogComponent.ts +++ b/src/js/stendhal/ui/component/ChatLogComponent.ts @@ -17,6 +17,7 @@ import { singletons } from "../../SingletonRepo"; import { Chat } from "../../util/Chat"; import { stendhal } from "../../stendhal"; +import { TouchHandler } from "ui/TouchHandler"; /** @@ -34,19 +35,20 @@ export class ChatLogComponent extends Component { super("chat"); this.refresh(); this.scrollStateBottom = this.isAtBottom(); + let touchHandler = TouchHandler.get(); this.componentElement.addEventListener("mouseup", (evt: MouseEvent) => { this.onContextMenu(evt) }); this.componentElement.addEventListener("touchstart", (evt: TouchEvent) => { const pos = stendhal.ui.html.extractPosition(evt); - stendhal.ui.touch.onTouchStart(pos.pageX, pos.pageY); + touchHandler.onTouchStart(pos.pageX, pos.pageY); }, {passive: true}); this.componentElement.addEventListener("touchend", (evt: TouchEvent) => { - stendhal.ui.touch.onTouchEnd(); + touchHandler.onTouchEnd(); this.onContextMenu(evt) // clean up - stendhal.ui.touch.unsetOrigin(); + touchHandler.unsetOrigin(); }); this.scrollListener = (evt: Event) => { @@ -350,7 +352,7 @@ export class ChatLogComponent extends Component { if (evt.type === "mouseup" && evt.button != 2) { return; } - if (evt.type === "touchend" && !stendhal.ui.touch.isLongTouch(evt)) { + if (evt.type === "touchend" && !TouchHandler.get().isLongTouch(evt)) { evt.preventDefault(); return; } diff --git a/src/js/stendhal/ui/component/ItemContainerImplementation.ts b/src/js/stendhal/ui/component/ItemContainerImplementation.ts index 39bf4b0044..fbf7540290 100644 --- a/src/js/stendhal/ui/component/ItemContainerImplementation.ts +++ b/src/js/stendhal/ui/component/ItemContainerImplementation.ts @@ -23,6 +23,7 @@ import { singletons } from "../../SingletonRepo"; import { Point } from "../../util/Point"; import { Paths } from "../../data/Paths"; import { HTMLImageElementUtil } from "sprite/image/HTMLImageElementUtil"; +import { TouchHandler } from "ui/TouchHandler"; /** @@ -37,6 +38,7 @@ export class ItemContainerImplementation { // marked for updating certain attributes private dirty = false; + private touchHandler = TouchHandler.get(); // TODO: replace usage of global document.getElementById() @@ -168,7 +170,7 @@ export class ItemContainerImplementation { private onDragStart(event: DragEvent|TouchEvent) { let myobject = this.object || marauroa.me; // some mobile browsers such as Chrome call "dragstart" via long touch - if (!myobject[this.slot] || (event.type === "dragstart" && stendhal.ui.touch.isTouchEngaged())) { + if (!myobject[this.slot] || (event.type === "dragstart" && this.touchHandler.isTouchEngaged())) { event.preventDefault(); return; } @@ -196,8 +198,8 @@ export class ItemContainerImplementation { if (event instanceof DragEvent && event.dataTransfer) { stendhal.ui.heldObject = heldObject; event.dataTransfer.setDragImage(img, 0, 0); - } else if (stendhal.ui.touch.isTouchEvent(event)) { - stendhal.ui.touch.setHolding(true); + } else if (this.touchHandler.isTouchEvent(event)) { + this.touchHandler.setHolding(true); // TODO: move when supported by mouse events const pos = stendhal.ui.html.extractPosition(event); singletons.getHeldObjectManager().set(heldObject, img, new Point(pos.pageX, pos.pageY)); @@ -287,7 +289,7 @@ export class ItemContainerImplementation { stendhal.ui.heldObject = undefined; // if ctrl is pressed or holding stackable item from touch event, we ask for the quantity - const touch_held = stendhal.ui.touch.holding() && quantity > 1; + const touch_held = this.touchHandler.holding() && quantity > 1; const split_action = !sameSlot && ((event instanceof DragEvent && event.ctrlKey) || touch_held); if (split_action) { const pos = stendhal.ui.html.extractPosition(event); @@ -344,7 +346,7 @@ export class ItemContainerImplementation { let event = stendhal.ui.html.extractPosition(evt); if ((event.target as any).dataItem) { - const long_touch = stendhal.ui.touch.isLongTouch(evt); + const long_touch = this.touchHandler.isLongTouch(evt); const context_action = (evt instanceof MouseEvent && this.isRightClick(evt)) || long_touch; if (this.quickPickup && !context_action) { marauroa.clientFramework.sendAction({ @@ -386,7 +388,7 @@ export class ItemContainerImplementation { } // clean up item held via touch - stendhal.ui.touch.setHolding(false); + this.touchHandler.setHolding(false); document.getElementById("viewport")!.focus(); } @@ -401,21 +403,21 @@ export class ItemContainerImplementation { private onTouchStart(evt: TouchEvent) { const pos = stendhal.ui.html.extractPosition(evt); - stendhal.ui.touch.onTouchStart(pos.pageX, pos.pageY); + this.touchHandler.onTouchStart(pos.pageX, pos.pageY); } private onTouchEnd(evt: TouchEvent) { - stendhal.ui.touch.onTouchEnd(); - if (stendhal.ui.touch.isLongTouch(evt) && !stendhal.ui.touch.holding()) { + this.touchHandler.onTouchEnd(); + if (this.touchHandler.isLongTouch(evt) && !this.touchHandler.holding()) { this.onMouseUp(evt); - } else if (stendhal.ui.touch.holding()) { + } else if (this.touchHandler.holding()) { evt.preventDefault(); this.onDrop(evt); - stendhal.ui.touch.setHolding(false); + this.touchHandler.setHolding(false); } // clean up touch handler - stendhal.ui.touch.unsetOrigin(); + this.touchHandler.unsetOrigin(); } /** From 8b2727f392dc9124b393ca78a8197ebd26c3ddd7 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Thu, 12 Feb 2026 21:59:12 +0100 Subject: [PATCH 142/162] converted stendhal.ui.html into static class HTMLUtil --- src/js/stendhal/Client.ts | 1 - src/js/stendhal/SingletonRepo.ts | 5 -- src/js/stendhal/entity/Entity.ts | 3 +- src/js/stendhal/sprite/TextBubble.ts | 3 +- .../ui/{HTMLManager.ts => HTMLUtil.ts} | 32 ++++--------- src/js/stendhal/ui/HeldObject.ts | 3 +- src/js/stendhal/ui/TouchHandler.ts | 3 +- src/js/stendhal/ui/ViewPort.ts | 46 ++++++++++--------- .../ui/component/BuddyListComponent.ts | 3 +- .../stendhal/ui/component/ChatLogComponent.ts | 7 +-- .../component/ItemContainerImplementation.ts | 19 ++++---- .../stendhal/ui/component/MiniMapComponent.ts | 3 +- .../stendhal/ui/dialog/ActionContextMenu.ts | 3 +- .../ui/dialog/ApplicationMenuDialog.ts | 5 +- src/js/stendhal/ui/dialog/TravelLogDialog.ts | 17 +++---- src/js/stendhal/ui/joystick/Joystick.ts | 3 +- src/js/stendhal/util/ElementClickListener.ts | 3 +- 17 files changed, 77 insertions(+), 82 deletions(-) rename src/js/stendhal/ui/{HTMLManager.ts => HTMLUtil.ts} (86%) diff --git a/src/js/stendhal/Client.ts b/src/js/stendhal/Client.ts index 9b433ec0a5..7d590aff7d 100644 --- a/src/js/stendhal/Client.ts +++ b/src/js/stendhal/Client.ts @@ -140,7 +140,6 @@ export class Client { private initUI() { stendhal.ui = stendhal.ui || {}; stendhal.ui.equip = singletons.getInventory(); - stendhal.ui.html = singletons.getHTMLManager(); stendhal.ui.viewport = singletons.getViewPort(); // alias for backward-compat until changed in all source stendhal.ui.gamewindow = stendhal.ui.viewport; diff --git a/src/js/stendhal/SingletonRepo.ts b/src/js/stendhal/SingletonRepo.ts index 00f9ca7078..8330a7444a 100644 --- a/src/js/stendhal/SingletonRepo.ts +++ b/src/js/stendhal/SingletonRepo.ts @@ -35,7 +35,6 @@ import { SoundManager } from "./data/sound/SoundManager"; import { ui } from "./ui/UI"; import { UIComponentEnum } from "./ui/UIComponentEnum"; import { HeldObjectManager } from "./ui/HeldObject"; -import { HTMLManager } from "./ui/HTMLManager"; import { Inventory } from "./ui/Inventory"; import { SoftwareJoystickController } from "./ui/SoftwareJoystickController"; import { UIUpdateObserver } from "./ui/UIUpdateObserver"; @@ -92,10 +91,6 @@ export class SingletonRepo { return HeldObjectManager.get(); } - static getHTMLManager(): HTMLManager { - return HTMLManager.get(); - } - static getInventory(): Inventory { return Inventory.get(); } diff --git a/src/js/stendhal/entity/Entity.ts b/src/js/stendhal/entity/Entity.ts index 7bd55a2837..1a8301f839 100644 --- a/src/js/stendhal/entity/Entity.ts +++ b/src/js/stendhal/entity/Entity.ts @@ -19,6 +19,7 @@ import { singletons } from "../SingletonRepo"; import { marauroa } from "marauroa" import { stendhal } from "../stendhal"; import { ImageSprite } from "../sprite/image/ImageSprite"; +import { HTMLUtil } from "ui/HTMLUtil"; /** * General entity @@ -184,7 +185,7 @@ export class Entity extends RPObject { // action replaces "Look" command (e. g. "look closely" on signs) if (this["action"]) { list.push({ - title: stendhal.ui.html.niceName(this["action"]), + title: HTMLUtil.niceName(this["action"]), type: this.actionAliasToAction(this["action"]) }); } else { diff --git a/src/js/stendhal/sprite/TextBubble.ts b/src/js/stendhal/sprite/TextBubble.ts index 4c76fa15a0..32e3fc0d4f 100644 --- a/src/js/stendhal/sprite/TextBubble.ts +++ b/src/js/stendhal/sprite/TextBubble.ts @@ -14,6 +14,7 @@ import { stendhal } from "../stendhal"; import { RenderingContext2D } from "util/Types"; import { Color } from "../data/color/Color"; import { Pair } from "../util/Pair"; +import { HTMLUtil } from "ui/HTMLUtil"; export abstract class TextBubble { @@ -110,7 +111,7 @@ export abstract class TextBubble { * Mouse or touch event executed on canvas context. */ onClick(evt: MouseEvent|TouchEvent) { - const pos = stendhal.ui.html.extractPosition(evt); + const pos = HTMLUtil.extractPosition(evt); const screenRect = document.getElementById("viewport")!.getBoundingClientRect(); const pointX = pos.clientX - screenRect.x + stendhal.ui.gamewindow.offsetX; const pointY = pos.clientY - screenRect.y + stendhal.ui.gamewindow.offsetY + TextBubble.adjustY; diff --git a/src/js/stendhal/ui/HTMLManager.ts b/src/js/stendhal/ui/HTMLUtil.ts similarity index 86% rename from src/js/stendhal/ui/HTMLManager.ts rename to src/js/stendhal/ui/HTMLUtil.ts index 490699a40d..d421b00278 100644 --- a/src/js/stendhal/ui/HTMLManager.ts +++ b/src/js/stendhal/ui/HTMLUtil.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2024 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -13,21 +13,7 @@ /** * HTML code manipulation. */ -export class HTMLManager { - - /** Singleton instance. */ - private static instance: HTMLManager; - - - /** - * Retrieves singleton instance. - */ - static get(): HTMLManager { - if (!HTMLManager.instance) { - HTMLManager.instance = new HTMLManager(); - } - return HTMLManager.instance; - } +export class HTMLUtil { /** * Hidden singleton constructor. @@ -36,7 +22,7 @@ export class HTMLManager { // do nothing } - esc(msg: string, filter=[]) { + public static esc(msg: string, filter: string[]=[]) { msg = msg.replace(//g, '>').replace(/"/g, '"').replace(/\n/g, "
    "); // restore filtered tags for (const tag of filter) { @@ -47,7 +33,7 @@ export class HTMLManager { return msg; } - niceName(s: string): string { + public static niceName(s: string): string { if (!s) { return ""; } @@ -63,7 +49,7 @@ export class HTMLManager { * @return {EventTarget} * Translated event target. */ - extractTarget(event: any): EventTarget { + public static extractTarget(event: any): EventTarget { if (event.changedTouches) { // FIXME: Always uses last index. Any way to detect which touch index was engaged? const tidx = event.changedTouches.length - 1; @@ -88,9 +74,9 @@ export class HTMLManager { * @return {any} * Normalized event. */ - extractPosition(event: any): any { + public static extractPosition(event: any): any { let pos = event; - const target = this.extractTarget(event); + const target = HTMLUtil.extractTarget(event); const canvas = target as HTMLCanvasElement; if (event.changedTouches) { // FIXME: Always uses last index. Any way to detect which touch index was engaged? @@ -117,7 +103,7 @@ export class HTMLManager { return pos; } - formatTallyMarks(line: string): any { + public static formatTallyMarks(line: string): any { let tmp = line.split(""); const pre = tmp[0]; tmp = tmp[1].split(""); @@ -157,7 +143,7 @@ export class HTMLManager { * @return {string} * Slot name. */ - parseSlotName(id: string): string { + public static parseSlotName(id: string): string { if (id.includes("-")) { return id.split("-")[0]; } diff --git a/src/js/stendhal/ui/HeldObject.ts b/src/js/stendhal/ui/HeldObject.ts index b9dfef374e..575105e306 100644 --- a/src/js/stendhal/ui/HeldObject.ts +++ b/src/js/stendhal/ui/HeldObject.ts @@ -13,6 +13,7 @@ import { stendhal } from "../stendhal"; import { Point } from "../util/Point"; +import { HTMLUtil } from "./HTMLUtil"; /** @@ -146,7 +147,7 @@ export class HeldObjectManager { * Handles event to update held object drawing position. */ private onDragWhileHeld(e: Event) { - const pos = stendhal.ui.html.extractPosition(e); + const pos = HTMLUtil.extractPosition(e); HeldObjectManager.get().setPosition(pos.pageX, pos.pageY); } diff --git a/src/js/stendhal/ui/TouchHandler.ts b/src/js/stendhal/ui/TouchHandler.ts index a50f54ce7b..87c6f3db56 100644 --- a/src/js/stendhal/ui/TouchHandler.ts +++ b/src/js/stendhal/ui/TouchHandler.ts @@ -12,6 +12,7 @@ import { stendhal } from "../stendhal"; import { Point } from "../util/Point"; +import { HTMLUtil } from "./HTMLUtil"; /** @@ -117,7 +118,7 @@ export class TouchHandler { const durationMatch = (this.timestampTouchEnd - this.timestampTouchStart > this.longTouchDuration); let positionMatch = true; if (evt && this.origin) { - const pos = stendhal.ui.html.extractPosition(evt); + const pos = HTMLUtil.extractPosition(evt); // if position has moved too much it's not a long touch positionMatch = (Math.abs(pos.pageX - this.origin.x) <= this.moveThreshold) && (Math.abs(pos.pageY - this.origin.y) <= this.moveThreshold); diff --git a/src/js/stendhal/ui/ViewPort.ts b/src/js/stendhal/ui/ViewPort.ts index b6a4c480e9..270d3cf617 100644 --- a/src/js/stendhal/ui/ViewPort.ts +++ b/src/js/stendhal/ui/ViewPort.ts @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2025 - Stendhal * + * (C) Copyright 2003-2026 - Stendhal * *************************************************************************** * * * This program is free software; you can redistribute it and/or modify * @@ -36,6 +36,7 @@ import { Debug } from "../util/Debug"; import { TileMap } from "data/TileMap"; import { HTMLImageElementUtil } from "sprite/image/HTMLImageElementUtil"; import { TouchHandler } from "./TouchHandler"; +import { HTMLUtil } from "./HTMLUtil"; /** @@ -87,8 +88,6 @@ export class ViewPort { /** Singleton instance. */ private static instance: ViewPort; - private touchHandler = TouchHandler.get(); - /** * Retrieves singleton instance. */ @@ -500,7 +499,7 @@ export class ViewPort { mHandle._onMouseDown = function(e: MouseEvent|TouchEvent) { let touchHandler = TouchHandler.get(); - var pos = stendhal.ui.html.extractPosition(e); + var pos = HTMLUtil.extractPosition(e); if (touchHandler.isTouchEvent(e)) { if (touchHandler.holding()) { // prevent default viewport action when item is "held" @@ -548,12 +547,13 @@ export class ViewPort { } mHandle.onMouseUp = function(e: MouseEvent|TouchEvent) { - const is_touch = this.touchHandler.isTouchEvent(e); + let touchHandler = TouchHandler.get(); + const is_touch = touchHandler.isTouchEvent(e); if (is_touch) { - this.touchHandler.onTouchEnd(e); + touchHandler.onTouchEnd(); } - var pos = stendhal.ui.html.extractPosition(e); - const long_touch = is_touch && this.touchHandler.isLongTouch(e); + var pos = HTMLUtil.extractPosition(e); + const long_touch = is_touch && touchHandler.isLongTouch(e); if ((e instanceof MouseEvent && mHandle.isRightClick(e)) || long_touch) { if (entity != stendhal.zone.ground) { const append: any[] = []; @@ -574,11 +574,11 @@ export class ViewPort { } mHandle.onDrag = function(e: MouseEvent) { - if (this.touchHandler.isTouchEvent(e)) { + if (TouchHandler.get().isTouchEvent(e)) { stendhal.ui.gamewindow.onDragStart(e); } - var pos = stendhal.ui.html.extractPosition(e); + var pos = HTMLUtil.extractPosition(e); var xDiff = startX - pos.offsetX; var yDiff = startY - pos.offsetY; // It's not really a click if the mouse has moved too much. @@ -605,7 +605,7 @@ export class ViewPort { * Updates cursor style when positioned over an element or entity. */ onMouseMove(e: MouseEvent) { - var pos = stendhal.ui.html.extractPosition(e); + var pos = HTMLUtil.extractPosition(e); var x = pos.canvasRelativeX + stendhal.ui.gamewindow.offsetX; var y = pos.canvasRelativeY + stendhal.ui.gamewindow.offsetY; var entity = stendhal.zone.entityAt(x, y); @@ -649,7 +649,7 @@ export class ViewPort { * Handles engaging an item or corpse to be dragged. */ onDragStart(e: DragEvent) { - var pos = stendhal.ui.html.extractPosition(e); + var pos = HTMLUtil.extractPosition(e); let draggedEntity; for (const obj of stendhal.zone.getEntitiesAt(pos.canvasRelativeX + stendhal.ui.gamewindow.offsetX, pos.canvasRelativeY + stendhal.ui.gamewindow.offsetY)) { @@ -679,9 +679,10 @@ export class ViewPort { return; } - if (this.touchHandler.isTouchEvent(e)) { + let touchHandler = TouchHandler.get(); + if (touchHandler.isTouchEvent(e)) { singletons.getHeldObjectManager().set(heldObject, img, new Point(pos.pageX, pos.pageY)); - this.touchHandler.setHolding(true); + touchHandler.setHolding(true); } else { stendhal.ui.heldObject = heldObject; } @@ -708,8 +709,8 @@ export class ViewPort { */ onDrop(e: DragEvent) { if (stendhal.ui.heldObject) { - var pos = stendhal.ui.html.extractPosition(e); - const targetSlot = stendhal.ui.html.parseSlotName((pos.target as HTMLElement).id); + var pos = HTMLUtil.extractPosition(e); + const targetSlot = HTMLUtil.parseSlotName((pos.target as HTMLElement).id); const action: any = { "zone": stendhal.ui.heldObject.zone }; @@ -730,7 +731,7 @@ export class ViewPort { let objectId = marauroa.me["id"]; if (e.type === "touchend" && targetSlot === "content") { // find the actual target ID for touch events - const container = stendhal.ui.equip.getByElement(stendhal.ui.html.extractTarget(event).parentElement!); + const container = stendhal.ui.equip.getByElement((HTMLUtil.extractTarget(event) as HTMLElement).parentElement!); if (container && container.object) { objectId = container.object.id; } @@ -745,7 +746,7 @@ export class ViewPort { // item was dropped stendhal.ui.heldObject = undefined; - const touch_held = this.touchHandler.holding() && quantity > 1; + const touch_held = TouchHandler.get().holding() && quantity > 1; // if ctrl is pressed or holding stackable item from touch event, we ask for the quantity // NOTE: don't create selector if touch source is ground if (e.ctrlKey || (touch_held && sourceSlot !== targetSlot)) { @@ -764,11 +765,12 @@ export class ViewPort { * This is a workaround until it's figured out how to make it work using the same methods as mouse event. */ onTouchEnd(e: TouchEvent) { - this.touchHandler.onTouchEnd(); + let touchHandler = TouchHandler.get(); + touchHandler.onTouchEnd(); stendhal.ui.gamewindow.onDrop(e); - if (this.touchHandler.holding()) { - this.touchHandler.setHolding(false); - this.touchHandler.unsetOrigin(); + if (touchHandler.holding()) { + touchHandler.setHolding(false); + touchHandler.unsetOrigin(); } // execute here because "touchend" event propagation is cancelled on the veiwport Client.handleClickIndicator(e); diff --git a/src/js/stendhal/ui/component/BuddyListComponent.ts b/src/js/stendhal/ui/component/BuddyListComponent.ts index fcb31e775f..bf6a20446b 100644 --- a/src/js/stendhal/ui/component/BuddyListComponent.ts +++ b/src/js/stendhal/ui/component/BuddyListComponent.ts @@ -21,6 +21,7 @@ import { stendhal } from "stendhal"; import { marauroa } from "marauroa" +import { HTMLUtil } from "ui/HTMLUtil"; /** * displays the player stats @@ -71,7 +72,7 @@ export class BuddyListComponent extends Component { } else { html += Paths.gui + "/buddy_offline.png"; } - html += "\"> " + stendhal.ui.html.esc(buddies[i].name) + ""; + html += "\"> " + HTMLUtil.esc(buddies[i].name) + ""; } if (this.lastHtml !== html) { diff --git a/src/js/stendhal/ui/component/ChatLogComponent.ts b/src/js/stendhal/ui/component/ChatLogComponent.ts index c02a3c46c2..94f661d1fc 100644 --- a/src/js/stendhal/ui/component/ChatLogComponent.ts +++ b/src/js/stendhal/ui/component/ChatLogComponent.ts @@ -18,6 +18,7 @@ import { Chat } from "../../util/Chat"; import { stendhal } from "../../stendhal"; import { TouchHandler } from "ui/TouchHandler"; +import { HTMLUtil } from "ui/HTMLUtil"; /** @@ -41,7 +42,7 @@ export class ChatLogComponent extends Component { this.onContextMenu(evt) }); this.componentElement.addEventListener("touchstart", (evt: TouchEvent) => { - const pos = stendhal.ui.html.extractPosition(evt); + const pos = HTMLUtil.extractPosition(evt); touchHandler.onTouchStart(pos.pageX, pos.pageY); }, {passive: true}); this.componentElement.addEventListener("touchend", (evt: TouchEvent) => { @@ -368,7 +369,7 @@ export class ChatLogComponent extends Component { options.unshift(new MenuItem("Copy", function() { log.exportContents(); })); } - const pos = stendhal.ui.html.extractPosition(evt); + const pos = HTMLUtil.extractPosition(evt); stendhal.ui.actionContextMenu.set(ui.createSingletonFloatingWindow("Action", new LogContextMenu(options), pos.pageX - 50, pos.pageY - 5)); @@ -393,7 +394,7 @@ class LogContextMenu extends Component { let content = "

    "; for (let i = 0; i < this.options.length; i++) { - content += ""; + content += ""; } content += "
    "; this.componentElement.innerHTML = content; diff --git a/src/js/stendhal/ui/component/ItemContainerImplementation.ts b/src/js/stendhal/ui/component/ItemContainerImplementation.ts index fbf7540290..c04a25b933 100644 --- a/src/js/stendhal/ui/component/ItemContainerImplementation.ts +++ b/src/js/stendhal/ui/component/ItemContainerImplementation.ts @@ -24,6 +24,7 @@ import { Point } from "../../util/Point"; import { Paths } from "../../data/Paths"; import { HTMLImageElementUtil } from "sprite/image/HTMLImageElementUtil"; import { TouchHandler } from "ui/TouchHandler"; +import { HTMLUtil } from "ui/HTMLUtil"; /** @@ -201,7 +202,7 @@ export class ItemContainerImplementation { } else if (this.touchHandler.isTouchEvent(event)) { this.touchHandler.setHolding(true); // TODO: move when supported by mouse events - const pos = stendhal.ui.html.extractPosition(event); + const pos = HTMLUtil.extractPosition(event); singletons.getHeldObjectManager().set(heldObject, img, new Point(pos.pageX, pos.pageY)); } } else { @@ -248,9 +249,9 @@ export class ItemContainerImplementation { private onDrop(event: DragEvent|TouchEvent) { const myobject = this.object || marauroa.me; if (stendhal.ui.heldObject) { - const pos = stendhal.ui.html.extractPosition(event); + const pos = HTMLUtil.extractPosition(event); const id = (pos.target as HTMLElement).id; - const targetSlot = stendhal.ui.html.parseSlotName(id); + const targetSlot = HTMLUtil.parseSlotName(id); if (event.type === "touchend" && id === "viewport") { stendhal.ui.gamewindow.onDrop(event); event.stopPropagation(); @@ -262,7 +263,7 @@ export class ItemContainerImplementation { if (event.type === "touchend") { // find the actual target ID for touch events if (targetSlot === "content") { - const container = stendhal.ui.equip.getByElement(stendhal.ui.html.extractTarget(event).parentElement!); + const container = stendhal.ui.equip.getByElement((HTMLUtil.extractTarget(event) as HTMLElement).parentElement!); if (container && container.object) { objectId = container.object.id; } @@ -292,7 +293,7 @@ export class ItemContainerImplementation { const touch_held = this.touchHandler.holding() && quantity > 1; const split_action = !sameSlot && ((event instanceof DragEvent && event.ctrlKey) || touch_held); if (split_action) { - const pos = stendhal.ui.html.extractPosition(event); + const pos = HTMLUtil.extractPosition(event); ui.createSingletonFloatingWindow("Quantity", new DropQuantitySelectorDialog(action, touch_held), pos.pageX - 50, pos.pageY - 25); @@ -322,9 +323,9 @@ export class ItemContainerImplementation { if (this.timestampMouseDown - this.timestampMouseDownPrev <= this.rightClickDuration) { // reset so subsequent single clicks/taps aren't counted this.timestampMouseDown = 0; - return (stendhal.ui.html.extractTarget(evt) as HTMLElement).id === this.lastClickedId; + return (HTMLUtil.extractTarget(evt) as HTMLElement).id === this.lastClickedId; } - this.lastClickedId = (stendhal.ui.html.extractTarget(evt) as HTMLElement).id; + this.lastClickedId = (HTMLUtil.extractTarget(evt) as HTMLElement).id; return false; } @@ -344,7 +345,7 @@ export class ItemContainerImplementation { return; } - let event = stendhal.ui.html.extractPosition(evt); + let event = HTMLUtil.extractPosition(evt); if ((event.target as any).dataItem) { const long_touch = this.touchHandler.isLongTouch(evt); const context_action = (evt instanceof MouseEvent && this.isRightClick(evt)) || long_touch; @@ -402,7 +403,7 @@ export class ItemContainerImplementation { } private onTouchStart(evt: TouchEvent) { - const pos = stendhal.ui.html.extractPosition(evt); + const pos = HTMLUtil.extractPosition(evt); this.touchHandler.onTouchStart(pos.pageX, pos.pageY); } diff --git a/src/js/stendhal/ui/component/MiniMapComponent.ts b/src/js/stendhal/ui/component/MiniMapComponent.ts index 9322d2f0e5..5019f175f9 100644 --- a/src/js/stendhal/ui/component/MiniMapComponent.ts +++ b/src/js/stendhal/ui/component/MiniMapComponent.ts @@ -19,6 +19,7 @@ import { Color } from "../../data/color/Color"; import { RenderingContext2D } from "util/Types"; import { stendhal } from "stendhal"; import { TileMap } from "data/TileMap"; +import { HTMLUtil } from "ui/HTMLUtil"; /** @@ -220,7 +221,7 @@ export class MiniMapComponent extends Component { if (!stendhal.config.getBoolean("pathfinding.minimap")) { return; } - let pos = stendhal.ui.html.extractPosition(event); + let pos = HTMLUtil.extractPosition(event); let x = Math.floor((pos.canvasRelativeX + this.xOffset) / this.scale); let y = Math.floor((pos.canvasRelativeY + this.yOffset) / this.scale); if (!this.map.collision(x, y)) { diff --git a/src/js/stendhal/ui/dialog/ActionContextMenu.ts b/src/js/stendhal/ui/dialog/ActionContextMenu.ts index 387b156318..d4465734ac 100644 --- a/src/js/stendhal/ui/dialog/ActionContextMenu.ts +++ b/src/js/stendhal/ui/dialog/ActionContextMenu.ts @@ -16,6 +16,7 @@ import { ChatInputComponent } from "../component/ChatInputComponent"; import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; +import { HTMLUtil } from "ui/HTMLUtil"; export class ActionContextMenu extends Component { private entity: any; @@ -31,7 +32,7 @@ export class ActionContextMenu extends Component { var content = "
    "; for (var i = 0; i < this.actions.length; i++) { // FIXME: the addition of "sub-actionbutton" class should no longer be needed - content += ""; + content += ""; } content += "
    "; this.componentElement.innerHTML = content; diff --git a/src/js/stendhal/ui/dialog/ApplicationMenuDialog.ts b/src/js/stendhal/ui/dialog/ApplicationMenuDialog.ts index c99607780b..bde75e9c0d 100644 --- a/src/js/stendhal/ui/dialog/ApplicationMenuDialog.ts +++ b/src/js/stendhal/ui/dialog/ApplicationMenuDialog.ts @@ -16,6 +16,7 @@ import { singletons } from "../../SingletonRepo"; import { Debug } from "../../util/Debug"; import { ScreenCapture } from "../../util/ScreenCapture"; +import { HTMLUtil } from "ui/HTMLUtil"; interface MenuAction { @@ -136,14 +137,14 @@ export class ApplicationMenuDialog extends DialogContentComponent { var content = ""; for (var i = 0; i < this.actions.length; i++) { - content += "

    " + stendhal.ui.html.esc(this.actions[i].title) + "

    " + content += "

    " + HTMLUtil.esc(this.actions[i].title) + "

    " for (var j = 0; j < this.actions[i].children.length; j++) { const action = this.actions[i].children[j]; let title = action.title; if (action.alt && action.condition && action.condition()) { title = action.alt; } - content += "
    "; + content += "
    "; } content += "
    "; } diff --git a/src/js/stendhal/ui/dialog/TravelLogDialog.ts b/src/js/stendhal/ui/dialog/TravelLogDialog.ts index ac3a5c7586..cec17d26d6 100644 --- a/src/js/stendhal/ui/dialog/TravelLogDialog.ts +++ b/src/js/stendhal/ui/dialog/TravelLogDialog.ts @@ -16,6 +16,7 @@ import { UIComponentEnum } from "../UIComponentEnum"; import { marauroa } from "marauroa" import { stendhal } from "../../stendhal"; +import { HTMLUtil } from "ui/HTMLUtil"; /** * a dialog to display images @@ -58,9 +59,9 @@ export class TravelLogDialog extends DialogContentComponent { private createHtml(dataItems: string[]) { let buttons = ""; for (var i = 0; i < dataItems.length; i++) { - buttons = buttons + ""; + + HTMLUtil.esc(dataItems[i]) + ""; } this.child(".tavellogtabpanel")!.innerHTML = buttons; @@ -136,8 +137,8 @@ export class TravelLogDialog extends DialogContentComponent { var html = ""; for (var i = 0; i < dataItems.length; i++) { const currentItem = dataItems[i]; - html += "