Update for 2.14.2-beta

Spacetech · Spacetech · commit d4de004582f4 · 2024-12-22T14:39:03.000-08:00
diff --git a/mod.json b/mod.json
@@ -1,7 +1,7 @@
 {
 	"name": "Debug Tools",
 	"description": "Adds a special debug tools menu into the game.",
-	"version": "2.3.4",
+	"version": "2.3.5",
 	"author": "Chiri Vulpes",
 	"github": "https://github.com/WaywardGame/debugtools",
 	"waywardVersion": "2.14.0-beta",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
 		"watch": "npx tsc --build --watch --pretty --preserveWatchOutput"
 	},
 	"devDependencies": {
-		"@wayward/types": "^2.14.1-beta",
+		"@wayward/types": "^2.14.2-beta",
 		"rimraf": "3.0.2",
 		"typescript": "^5.7.2"
 	}
diff --git a/src/ui/InspectDialog.ts b/src/ui/InspectDialog.ts
@@ -5,7 +5,6 @@ import Entity from "@wayward/game/game/entity/Entity";
 import type Island from "@wayward/game/game/island/Island";
 import Item from "@wayward/game/game/item/Item";
 import type { IOverlayInfo } from "@wayward/game/game/tile/ITerrain";
-import { TerrainType } from "@wayward/game/game/tile/ITerrain";
 import Tile from "@wayward/game/game/tile/Tile";
 import type Translation from "@wayward/game/language/Translation";
 import Mod from "@wayward/game/mod/Mod";
@@ -40,6 +39,7 @@ import ItemInformation from "./inspect/ItemInformation";
 import TerrainInformation from "./inspect/TerrainInformation";
 import TileEventInformation from "./inspect/TileEventInformation";
 import VehicleInformation from "./inspect/VehicleInformation";
+import ConsoleUtility from "@wayward/utilities/console/ConsoleUtility";
 
 export type InspectDialogInformationSectionClass = new () => InspectInformationSection;
 
@@ -164,7 +164,8 @@ export default class InspectDialog extends TabDialog<InspectInformationSection>
 
 		const item = what instanceof Item ? what : undefined;
 		if (item) {
-			this.LOG.info("Item:", item);
+			ConsoleUtility.magic.$$item(item);
+			this.LOG.info("$$item:", item["debug"]);
 		}
 
 		while (what instanceof Item) {
@@ -352,8 +353,13 @@ export default class InspectDialog extends TabDialog<InspectInformationSection>
 	@Bound
 	private logUpdate(): void {
 		if (this.shouldLog) {
-			const tileData = this.tile ? this.tile.getTileData() : undefined;
-			this.LOG.info("Tile:", this.tile, this.tile?.toString(), tileData?.map(data => TerrainType[data.type]).join(", "), tileData);
+			Object.defineProperty(window, "$$tile", {
+				configurable: true,
+				get: () => {
+					return this.tile;
+				},
+			});
+			this.LOG.info("$$tile:", this.tile?.["debug"]);
 			this.shouldLog = false;
 		}
 
diff --git a/src/ui/inspect/CorpseInformation.ts b/src/ui/inspect/CorpseInformation.ts
@@ -66,7 +66,7 @@ export default class CorpseInformation extends InspectInformationSection {
 
 	public override logUpdate(): void {
 		for (const corpse of this.corpses) {
-			this.LOG.info("Corpse:", corpse);
+			this.LOG.info("Corpse:", corpse?.["debug"]);
 		}
 	}
 
diff --git a/src/ui/inspect/CreatureInformation.ts b/src/ui/inspect/CreatureInformation.ts
@@ -17,6 +17,7 @@ import ToggleAiMask from "../../action/ToggleAiMask";
 import ToggleAiType from "../../action/ToggleAiType";
 import { DebugToolsTranslation, translation } from "../../IDebugTools";
 import InspectEntityInformationSubsection from "../component/InspectEntityInformationSubsection";
+import ConsoleUtility from "@wayward/utilities/console/ConsoleUtility";
 
 interface IAiRefreshable {
 	refresh?(): any;
@@ -135,6 +136,7 @@ export default class CreatureInformation extends InspectEntityInformationSubsect
 			return;
 		}
 
+		ConsoleUtility.magic.$$creature(this, me => me?.creature);
 		this.creature = entity.asCreature;
 		this.event.emit("change");
 
diff --git a/src/ui/inspect/DoodadInformation.ts b/src/ui/inspect/DoodadInformation.ts
@@ -18,6 +18,7 @@ import SetGrowingStage from "../../action/SetGrowingStage";
 import Container from "../component/Container";
 import type { TabInformation } from "../component/InspectInformationSection";
 import InspectInformationSection from "../component/InspectInformationSection";
+import ConsoleUtility from "@wayward/utilities/console/ConsoleUtility";
 
 export default class DoodadInformation extends InspectInformationSection {
 
@@ -83,7 +84,8 @@ export default class DoodadInformation extends InspectInformationSection {
 	}
 
 	public override logUpdate(): void {
-		this.LOG.info("Doodad:", this.doodad);
+		ConsoleUtility.magic.$$doodad(this, me => me?.doodad);
+		this.LOG.info("$$doodad:", this.doodad?.["debug"]);
 	}
 
 	@Bound
diff --git a/src/ui/inspect/EntityInformation.ts b/src/ui/inspect/EntityInformation.ts
@@ -43,6 +43,7 @@ import CreatureInformation from "./CreatureInformation";
 import HumanInformation from "./HumanInformation";
 import NpcInformation from "./NpcInformation";
 import PlayerInformation from "./PlayerInformation";
+import ConsoleUtility from "@wayward/utilities/console/ConsoleUtility";
 
 export type InspectDialogEntityInformationSubsectionClass = new () => InspectEntityInformationSubsection;
 
@@ -201,9 +202,13 @@ export default class EntityInformation extends InspectInformationSection {
 	}
 
 	public override logUpdate(): void {
-		for (const entity of this.entities) {
-			this.LOG.info("Entity:", entity);
+		for (let i = 0; i < this.entities.length; i++) {
+			const entity = this.entities[i];
+			const isLastEntity = i === this.entities.length - 1;
+			this.LOG.info(isLastEntity ? "$$entity" : `Entity ${i}:`, entity?.["debug"]);
 		}
+
+		ConsoleUtility.magic.$$entity(this, me => me?.entities.at(-1));
 	}
 
 	private initializeStats(): void {
diff --git a/src/ui/inspect/ItemInformation.ts b/src/ui/inspect/ItemInformation.ts
@@ -7,6 +7,7 @@ import { DEBUG_TOOLS_ID, DebugToolsTranslation, translation } from "../../IDebug
 import Container from "../component/Container";
 import type { TabInformation } from "../component/InspectInformationSection";
 import InspectInformationSection from "../component/InspectInformationSection";
+import ConsoleUtility from "@wayward/utilities/console/ConsoleUtility";
 
 export default class ItemInformation extends InspectInformationSection {
 
@@ -37,7 +38,8 @@ export default class ItemInformation extends InspectInformationSection {
 	}
 
 	public override logUpdate(): void {
-		this.LOG.info("Items:", this.tile?.containedItems);
+		ConsoleUtility.magic.$$items(this, me => me?.tile.containedItems);
+		this.LOG.info("$$items:", this.tile?.containedItems?.map(item => item["debug"]));
 	}
 
 	@Bound private getTile(): ITileContainer {
diff --git a/src/ui/inspect/NpcInformation.ts b/src/ui/inspect/NpcInformation.ts
@@ -6,6 +6,7 @@ import { Bound } from "@wayward/utilities/Decorators";
 import Remove from "../../action/Remove";
 import { DebugToolsTranslation, translation } from "../../IDebugTools";
 import InspectEntityInformationSubsection from "../component/InspectEntityInformationSubsection";
+import ConsoleUtility from "@wayward/utilities/console/ConsoleUtility";
 
 export default class NpcInformation extends InspectEntityInformationSubsection {
 	private npc: NPC | undefined;
@@ -22,6 +23,10 @@ export default class NpcInformation extends InspectEntityInformationSubsection {
 	public override update(entity: Creature | Player | NPC): void {
 		this.npc = entity.asNPC;
 		this.toggle(!!this.npc);
+
+		if (this.npc) {
+			ConsoleUtility.magic.$$npc(this, me => me?.npc);
+		}
 	}
 
 	@Bound
diff --git a/src/ui/inspect/PlayerInformation.ts b/src/ui/inspect/PlayerInformation.ts
@@ -25,6 +25,7 @@ import ToggleFastMovement from "../../action/ToggleFastMovement";
 import InspectEntityInformationSubsection from "../component/InspectEntityInformationSubsection";
 import SetPlayerData from "../../action/SetPlayerData";
 import { RenderSource } from "@wayward/game/renderer/IRenderer";
+import ConsoleUtility from "@wayward/utilities/console/ConsoleUtility";
 
 export default class PlayerInformation extends InspectEntityInformationSubsection {
 
@@ -160,6 +161,7 @@ export default class PlayerInformation extends InspectEntityInformationSubsectio
 			return;
 		}
 
+		ConsoleUtility.magic.$$player(this, me => me?.player);
 		this.event.emit("change");
 
 		this.refresh();
diff --git a/src/ui/inspect/TerrainInformation.ts b/src/ui/inspect/TerrainInformation.ts
@@ -101,7 +101,6 @@ export default class TerrainInformation extends InspectInformationSection {
 	}
 
 	public override logUpdate(): void {
-		this.LOG.info("Terrain:", this.terrainType, ...this.isTillable() ? ["Tilled:", this.isTilled()] : []);
 	}
 
 	@Bound
diff --git a/src/ui/inspect/TileEventInformation.ts b/src/ui/inspect/TileEventInformation.ts
@@ -58,7 +58,7 @@ export default class TileEventInformation extends InspectInformationSection {
 
 	public override logUpdate(): void {
 		for (const tileEvent of this.tileEvents) {
-			this.LOG.info("Tile Event:", tileEvent);
+			this.LOG.info("Tile Event:", tileEvent?.["debug"]);
 		}
 	}
 
diff --git a/src/ui/inspect/VehicleInformation.ts b/src/ui/inspect/VehicleInformation.ts
@@ -31,7 +31,7 @@ export default class VehicleInformation extends DoodadInformation {
 	}
 
 	public override logUpdate(): void {
-		this.LOG.info("Vehicle:", this.doodad);
+		this.LOG.info("Vehicle:", this.doodad?.["debug"]);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Debug Tools",`
`3`	`3`	`"description": "Adds a special debug tools menu into the game.",`
`4`		`- "version": "2.3.4",`
	`4`	`+ "version": "2.3.5",`
`5`	`5`	`"author": "Chiri Vulpes",`
`6`	`6`	`"github": "https://github.com/WaywardGame/debugtools",`
`7`	`7`	`"waywardVersion": "2.14.0-beta",`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"watch": "npx tsc --build --watch --pretty --preserveWatchOutput"`
`11`	`11`	`},`
`12`	`12`	`"devDependencies": {`
`13`		`- "@wayward/types": "^2.14.1-beta",`
	`13`	`+ "@wayward/types": "^2.14.2-beta",`
`14`	`14`	`"rimraf": "3.0.2",`
`15`	`15`	`"typescript": "^5.7.2"`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ export default class CorpseInformation extends InspectInformationSection {`
`66`	`66`
`67`	`67`	`public override logUpdate(): void {`
`68`	`68`	`for (const corpse of this.corpses) {`
`69`		`- this.LOG.info("Corpse:", corpse);`
	`69`	`+ this.LOG.info("Corpse:", corpse?.["debug"]);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import SetGrowingStage from "../../action/SetGrowingStage";`
`18`	`18`	`import Container from "../component/Container";`
`19`	`19`	`import type { TabInformation } from "../component/InspectInformationSection";`
`20`	`20`	`import InspectInformationSection from "../component/InspectInformationSection";`
	`21`	`+import ConsoleUtility from "@wayward/utilities/console/ConsoleUtility";`
`21`	`22`
`22`	`23`	`export default class DoodadInformation extends InspectInformationSection {`
`23`	`24`
`@@ -83,7 +84,8 @@ export default class DoodadInformation extends InspectInformationSection {`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`public override logUpdate(): void {`
`86`		`- this.LOG.info("Doodad:", this.doodad);`
	`87`	`+ ConsoleUtility.magic.$$doodad(this, me => me?.doodad);`
	`88`	`+ this.LOG.info("$$doodad:", this.doodad?.["debug"]);`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`@Bound`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ import CreatureInformation from "./CreatureInformation";`
`43`	`43`	`import HumanInformation from "./HumanInformation";`
`44`	`44`	`import NpcInformation from "./NpcInformation";`
`45`	`45`	`import PlayerInformation from "./PlayerInformation";`
	`46`	`+import ConsoleUtility from "@wayward/utilities/console/ConsoleUtility";`
`46`	`47`
`47`	`48`	`export type InspectDialogEntityInformationSubsectionClass = new () => InspectEntityInformationSubsection;`
`48`	`49`
`@@ -201,9 +202,13 @@ export default class EntityInformation extends InspectInformationSection {`
`201`	`202`	`}`
`202`	`203`
`203`	`204`	`public override logUpdate(): void {`
`204`		`- for (const entity of this.entities) {`
`205`		`- this.LOG.info("Entity:", entity);`
	`205`	`+ for (let i = 0; i < this.entities.length; i++) {`
	`206`	`+ const entity = this.entities[i];`
	`207`	`+ const isLastEntity = i === this.entities.length - 1;`
	`208`	+ this.LOG.info(isLastEntity ? "$$entity" : `Entity ${i}:`, entity?.["debug"]);
`206`	`209`	`}`
	`210`	`+`
	`211`	`+ ConsoleUtility.magic.$$entity(this, me => me?.entities.at(-1));`
`207`	`212`	`}`
`208`	`213`
`209`	`214`	`private initializeStats(): void {`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import { DEBUG_TOOLS_ID, DebugToolsTranslation, translation } from "../../IDebug`
`7`	`7`	`import Container from "../component/Container";`
`8`	`8`	`import type { TabInformation } from "../component/InspectInformationSection";`
`9`	`9`	`import InspectInformationSection from "../component/InspectInformationSection";`
	`10`	`+import ConsoleUtility from "@wayward/utilities/console/ConsoleUtility";`
`10`	`11`
`11`	`12`	`export default class ItemInformation extends InspectInformationSection {`
`12`	`13`
`@@ -37,7 +38,8 @@ export default class ItemInformation extends InspectInformationSection {`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`public override logUpdate(): void {`
`40`		`- this.LOG.info("Items:", this.tile?.containedItems);`
	`41`	`+ ConsoleUtility.magic.$$items(this, me => me?.tile.containedItems);`
	`42`	`+ this.LOG.info("$$items:", this.tile?.containedItems?.map(item => item["debug"]));`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`@Bound private getTile(): ITileContainer {`