@wayward/types 2.13.0-beta.dev.20230430.2 → 2.13.0-beta.dev.20230502.1

package/definitions/game/game/entity/action/ActionsRegistration.d.ts

@@ -151,7 +151,7 @@ export declare const actionDescriptionsSlow: {
     101: import("./Action").Action<[], import("../Human").default<number>, void, import("game/entity/action/actions/ToggleHitch").IToggleHitchCanUse, []>;
     112: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/ToggleTilled").ITillCanUse, [(import("../../item/Item").default | undefined)?]>;
     102: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [(import("../../doodad/Doodad").default | import("../../item/Item").default | undefined)?]>;
-    73: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.NPCNearby], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [import("../npc/NPC").default]>;
+    73: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.NPCNearby], import("../Human").default<number>, void, import("game/entity/action/actions/NPCInteract").INPCInteractUsable, [import("../npc/NPC").default]>;
     35: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory, [import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Transmogrify").ITransmogrifyCanUse, [import("../../item/Item").default, (import("../../item/Item").default | undefined)?]>;
     124: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/Uncage").IUncageCanUse, [import("../../item/Item").default]>;
     64: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [(import("../../item/Item").default | undefined)?]>;

package/definitions/game/game/entity/action/actions/Trade.d.ts

@@ -10,5 +10,5 @@
  */
 import { Action } from "game/entity/action/Action";
 import { ActionArgument } from "game/entity/action/IAction";
-declare const _default: Action<[ActionArgument.NPCNearby], import("../../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [import("../../npc/NPC").default]>;
+declare const _default: Action<[ActionArgument.NPCNearby], import("../../Human").default<number>, void, import("game/entity/action/actions/NPCInteract").INPCInteractUsable, [import("../../npc/NPC").default]>;
 export default _default;

package/definitions/game/game/entity/npc/NPC.d.ts

@@ -26,7 +26,7 @@ import { TileUpdateType } from "game/IGame";
 import type { IContainer, ItemType } from "game/item/IItem";
 import type Item from "game/item/Item";
 import type Tile from "game/tile/Tile";
-import Message from "language/dictionary/Message";
+import type TranslationImpl from "language/impl/TranslationImpl";
 import Translation from "language/Translation";
 export interface INPCEvents extends Events<Human> {
     /**
@@ -116,7 +116,7 @@ export default abstract class NPC extends Human<NPCType> {
     /**
      * @param timeSinceLastChat The time it's been since the human last chatted with this NPC, or false if it's the first time.
      */
-    getGreeting(human: Human, timeSinceLastChat: number | false): Message | undefined;
+    getGreeting(human: Human, timeSinceLastChat: number | false): TranslationImpl | undefined;
     getDefaultInteraction(): number | undefined;
     isAlreadyInteracting(human: Human, interactType?: number): boolean;
     canInteract(human: Human, interactType?: number): IActionUsable | IActionNotUsable;
@@ -134,7 +134,7 @@ export default abstract class NPC extends Human<NPCType> {
      * Sets the default weightCapacity of an NPC (based on their equipment and starting items).
      */
     generateWeightCapacity(): void;
-    getName(asKnownBy?: Human): import("../../../language/impl/TranslationImpl").default;
+    getName(asKnownBy?: Human): TranslationImpl;
     /**
      * The name of the npc - called when created
      */

package/definitions/game/game/entity/npc/npcs/Merchant.d.ts

@@ -18,7 +18,7 @@ import NPC from "game/entity/npc/NPC";
 import type { IContainer } from "game/item/IItem";
 import { ItemType } from "game/item/IItem";
 import type Item from "game/item/Item";
-import Message from "language/dictionary/Message";
+import type TranslationImpl from "language/impl/TranslationImpl";
 export interface IMerchantBuyPrice {
     base: number;
     bonus: number;
@@ -40,7 +40,7 @@ export default class MerchantNPC extends NPC {
     getPublicContainer(): IContainer | undefined;
     getSellPrice(human: Human, item: Item): number | undefined;
     getBuyPrice(human: Human, item: Item): IMerchantBuyPrice | undefined;
-    getGreeting(human: Human, timeSinceLastChat: number | false): Message | undefined;
+    getGreeting(human: Human, timeSinceLastChat: number | false): TranslationImpl | undefined;
     canInteract(human: Human): IActionUsable | IActionNotUsable;
     interact(action: IActionHandlerApi<Human>, interactType?: number | undefined): void;
     /**
@@ -48,7 +48,7 @@ export default class MerchantNPC extends NPC {
      */
     closeContainerDialogs(): void;
     protected getReputationChangeOnDeath(): number;
-    protected getDefaultName(): import("../../../../language/impl/TranslationImpl").default;
+    protected getDefaultName(): TranslationImpl;
     protected initializeStats(): void;
     protected getDefaultEquipment(equipType: EquipType): Item | ItemType | undefined;
     protected getDefaultInventory(): Array<Item | ItemType>;

package/definitions/game/game/entity/npc/npcs/Shipper.d.ts

@@ -21,7 +21,7 @@ import type { IContainer } from "game/item/IItem";
 import { ItemType } from "game/item/IItem";
 import type Item from "game/item/Item";
 import type Tile from "game/tile/Tile";
-import Message from "language/dictionary/Message";
+import type TranslationImpl from "language/impl/TranslationImpl";
 import type { IVector2 } from "utilities/math/IVector";
 interface IShipTarget {
     islandId: IslandId;
@@ -33,7 +33,7 @@ export default class ShipperNPC extends NPC {
     constructor(options?: INPCConstructorOptions);
     spawn(): void;
     getActions(): ActionType[] | undefined;
-    getGreeting(human: Human, timeSinceLastChat: number | false): Message | undefined;
+    getGreeting(human: Human, timeSinceLastChat: number | false): TranslationImpl | undefined;
     getDefaultInteraction(): number | undefined;
     canInteract(human: Human, interactType: number): IActionUsable | IActionNotUsable;
     interact(action: IActionHandlerApi<Human>, interactType: ShipperNPCInteractType): void;
@@ -44,7 +44,7 @@ export default class ShipperNPC extends NPC {
     canSailTo(x: number, y: number): boolean;
     getPublicContainer(): IContainer | undefined;
     protected getReputationChangeOnDeath(): number;
-    protected getDefaultName(): import("../../../../language/impl/TranslationImpl").default;
+    protected getDefaultName(): TranslationImpl;
     protected initializeStats(): void;
     protected getDefaultEquipment(equipType: EquipType): Item | ItemType | undefined;
     protected getDefaultInventory(): Array<Item | ItemType>;
@@ -61,5 +61,6 @@ export default class ShipperNPC extends NPC {
     canMoveToTile(moveType: MoveType, tile: Tile, ignoreHuman?: Human): -1 | 0 | -2 | -3 | -4 | -5 | -6;
     shipToPort(island: Island, port: IIslandPort, pathToEdge: IVector2[]): void;
     private moveToPort;
+    private canSeePort;
 }
 export {};

package/definitions/game/game/inspection/InfoProvider.d.ts

@@ -163,7 +163,7 @@ export declare class SimpleInfoProvider extends InfoProvider {
     private childComponentClass;
     private validWhen?;
     constructor(...translations: Array<TranslationGenerator | InfoProvider>);
-    get(): (import("../../language/ITranslation").ISerializedTranslation | import("../../language/impl/TranslationImpl").default | import("../../language/dictionary/UiTranslation").default | (() => import("../../language/ITranslation").ISerializedTranslation | import("../../language/impl/TranslationImpl").default | import("../../utilities/string/Interpolator").IStringSection[] | import("../../language/dictionary/UiTranslation").default | undefined) | InfoProvider)[];
+    get(): (import("../../language/impl/TranslationImpl").default | import("../../language/ITranslation").ISerializedTranslation | import("../../language/dictionary/UiTranslation").default | (() => import("../../language/impl/TranslationImpl").default | import("../../language/ITranslation").ISerializedTranslation | import("../../utilities/string/Interpolator").IStringSection[] | import("../../language/dictionary/UiTranslation").default | undefined) | InfoProvider)[];
     add(...translations: Array<TranslationGenerator | InfoProvider | Falsy>): this;
     onlyIfHasContents(): this | undefined;
     addInfoGetter(provider: () => InfoProvider | undefined): this;

package/definitions/game/game/inspection/infoProviders/item/ItemUses.d.ts

@@ -47,13 +47,12 @@ export default class ItemUses extends Uses<Item> {
     } & {
         getDoodadSkill: () => import("../LabelledValue").default[];
     }, Item> | import("../UseInfo").default<{
-        onConsume: number | import("game/item/IItem").ConsumeItemStatsTuple;
+        onConsume: [import("../../../entity/IStats").Stat, number][];
         skill: import("../../../entity/IHuman").SkillType | undefined;
         itemQuality: import("../../../IObject").Quality | undefined;
         qualityBonus: number;
         skillBonus: number;
         magicalBonus: number;
-        stats: import("../../../entity/IStats").Stat[];
         entityType: EntityType.Item;
         value?: Item | undefined;
         type: ItemType;

package/definitions/game/game/inspection/infoProviders/item/use/ItemConsumeInfo.d.ts

@@ -9,22 +9,21 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import { ActionType } from "game/entity/action/IAction";
-import { Stat } from "game/entity/IStats";
+import type { Stat } from "game/entity/IStats";
 import UseInfo from "game/inspection/infoProviders/UseInfo";
 import type Item from "game/item/Item";
 import type Tooltip from "ui/tooltip/Tooltip";
 declare const _default: UseInfo<{
-    onConsume: number | import("../../../../item/IItem").ConsumeItemStatsTuple;
+    onConsume: [Stat, number][];
     skill: import("../../../../entity/IHuman").SkillType | undefined;
     itemQuality: import("../../../../IObject").Quality | undefined;
     qualityBonus: number;
     skillBonus: number;
     magicalBonus: number;
-    stats: Stat[];
     entityType: import("../../../../entity/IEntity").EntityType.Item;
     value?: Item | undefined;
-    type: import("../../../../item/IItem").ItemType;
-    description: import("../../../../item/IItem").IItemDescription;
+    type: import("game/item/IItem").ItemType;
+    description: import("game/item/IItem").IItemDescription;
     quality: import("../../../../IObject").Quality;
     action: ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.Cure | ActionType.HealOther;
     union: import("game/inspection/infoProviders/UseInfo").IUseInfoBase<Item, ActionType.Eat | ActionType.DrinkItem | ActionType.Heal | ActionType.Cure | ActionType.HealOther>;

package/definitions/game/game/item/IItem.d.ts

@@ -17,7 +17,7 @@ import type Creature from "game/entity/creature/Creature";
 import type { CreatureType, TileGroup } from "game/entity/creature/ICreature";
 import type { DamageType, Defense, MoveType, StatusType } from "game/entity/IEntity";
 import type { Delay, EquipType, SkillType } from "game/entity/IHuman";
-import type { Stat } from "game/entity/IStats";
+import { Stat } from "game/entity/IStats";
 import type { IDecayTemperatureRange } from "game/IGame";
 import type { IObjectDescription, Quality } from "game/IObject";
 import type { IslandId } from "game/island/IIsland";
@@ -302,18 +302,24 @@ export interface IItemDescription extends IObjectDescription, IModdable, ITemper
     onCreate?(item: Item): void;
     onChangeInto?(item: Item, fromItemType: ItemType): void;
 }
-export type ConsumeItemStatsTuple = [health: number, stamina: number, hunger: number, thirst: number, otherStats?: Array<{
+export interface IConsumeItemStat {
     stat: Stat;
     amount: number;
-}>];
+}
+export type ConsumeItemStatsTuple = [health: number, stamina: number, hunger: number, thirst: number, otherStats?: IConsumeItemStat[]];
+export type ConsumeItemStats = ConsumeItemStatsTuple | IConsumeItemStat[];
+export declare namespace ConsumeItemStats {
+    const DEFAULT_STATS: Stat[];
+    function resolve(stats?: number | ConsumeItemStats): Map<Stat, number>;
+}
 export interface IItemOnUse {
-    [ActionType.Apply]?: ConsumeItemStatsTuple;
+    [ActionType.Apply]?: ConsumeItemStats;
     [ActionType.Build]?: IItemBuild;
     [ActionType.CageCreature]?: ItemType;
-    [ActionType.Cure]?: ConsumeItemStatsTuple;
-    [ActionType.DrinkItem]?: ConsumeItemStatsTuple;
-    [ActionType.Eat]?: ConsumeItemStatsTuple;
-    [ActionType.Heal]?: ConsumeItemStatsTuple;
+    [ActionType.Cure]?: ConsumeItemStats;
+    [ActionType.DrinkItem]?: ConsumeItemStats;
+    [ActionType.Eat]?: ConsumeItemStats;
+    [ActionType.Heal]?: ConsumeItemStats;
     [ActionType.HealOther]?: number;
     [ActionType.PlaceDown]?: IItemBuild;
     [ActionType.Plant]?: DoodadType;

package/definitions/game/language/Translation.d.ts

@@ -153,7 +153,7 @@ declare module Translation {
         translation?(translation: TranslationImpl | ISerializedTranslation): any;
         argument?(argument: TranslationArg): TranslationArg;
     }
-    function upgrade(translation: ISerializedTranslation, id: `${keyof typeof Dictionary}:${string}`, dictionary: Dictionary, entry: number, upgrader?: ITranslationUpgrader): ISerializedTranslation | TranslationImpl;
+    function upgrade(translation: ISerializedTranslation, id: `${keyof typeof Dictionary}:${string}`, dictionary: Dictionary, entry: number, upgrader?: ITranslationUpgrader): TranslationImpl | ISerializedTranslation;
     function upgradeTranslationArgument(argument: TranslationArg, id: string, dictionary: Dictionary, entry: number, upgrader?: ITranslationUpgrader): TranslationArg;
 }
 export default Translation;

package/definitions/game/multiplayer/IMultiplayer.d.ts

@@ -12,8 +12,9 @@ import { LobbyType } from "@hosts/shared/interfaces";
 import type { ICharacter } from "game/entity/IHuman";
 import type { PlayerState } from "game/entity/player/IPlayer";
 import type Player from "game/entity/player/Player";
-import type { ISynchronizeState } from "game/IGame";
+import type { ISynchronizeState, PauseSource } from "game/IGame";
 import { TurnMode } from "game/IGame";
+import type { Load } from "game/meta/Loading";
 import type { Milestone } from "game/milestones/IMilestone";
 import type { GameMode, IGameOptions } from "game/options/IGameOptions";
 import type { IMatchmakingInfo } from "multiplayer/matchmaking/IMatchmaking";
@@ -213,3 +214,15 @@ export interface IJoinServerOptions {
     automaticallyRetry: boolean;
     enableSteamNetworkConnections: boolean;
 }
+export interface IMultiplayerRunSafelyOptions {
+    isSynced: boolean;
+    pauseGame?: PauseSource;
+    pauseIncomingPacketProcessing?: boolean;
+    showLoadingScreen?: {
+        load: Load;
+        args?: any[];
+        excludeTargets?: PacketTarget;
+        disableDelayAfter?: boolean;
+        hostInitiatesHide?: boolean;
+    };
+}

package/definitions/game/multiplayer/Multiplayer.d.ts

@@ -11,7 +11,7 @@
 import EventEmitter from "event/EventEmitter";
 import Player from "game/entity/player/Player";
 import type Island from "game/island/Island";
-import type { IJoinServerOptions, IMultiplayerEvents, IMultiplayerOptions, PacketTarget, ServerInfo } from "multiplayer/IMultiplayer";
+import type { IJoinServerOptions, IMultiplayerEvents, IMultiplayerOptions, IMultiplayerRunSafelyOptions, PacketTarget, ServerInfo } from "multiplayer/IMultiplayer";
 import { DisconnectReason, JoinServerRetryReason, MultiplayerSyncCheck, MultiplayerSyncCheckLevel, UnableToJoinReason } from "multiplayer/IMultiplayer";
 import type { IMatchmakingInfo } from "multiplayer/matchmaking/IMatchmaking";
 import type { IConnection } from "multiplayer/networking/IConnection";
@@ -146,10 +146,14 @@ export default class Multiplayer extends EventEmitter.Host<IMultiplayerEvents> {
     markCurrentProcessingPacket(packetId: number, processing: boolean): void;
     clearSyncPacketWaiting(packet: IPacket, wait: number): void;
     clearSyncPacketsWaiting(waitId?: string): void;
-    pauseIncomingPacketProcessing(pause: boolean, clearQueue?: boolean): void;
+    private pauseIncomingPacketProcessing;
+    /**
+     * Execute an async function while applying some temporary state changes
+     */
+    runSafely<T = void>(executor: () => Promise<T>, options: IMultiplayerRunSafelyOptions): Promise<T>;
     updatePlayerId(oldPid: number, newPid: number): void;
     suppressSyncChecks(suppress: boolean): void;
-    syncGameState(): void;
+    syncGameState(): Promise<void>;
     isKeepAliveTimeoutPaused(): boolean;
     pauseKeepAliveTimeouts(): void;
     resumeKeepAliveTimeouts(): void;

package/definitions/game/multiplayer/packets/server/ConnectPacket.d.ts

@@ -16,5 +16,5 @@ export default class ConnectPacket extends ServerPacket {
     getDebugInfo(): string;
     getAllowedStates(): ConnectionState;
     isAllowedWhenPaused(): boolean;
-    process(): void;
+    process(): Promise<void>;
 }

package/definitions/game/steamworks/Steamworks.d.ts

@@ -45,6 +45,7 @@ export default class Steamworks extends EventEmitter.Host<ISteamworksEvents> {
     private _serverToJoin;
     private _automaticallyJoinServer;
     private _dedicatedServerInfo;
+    private _defaultMatchmakingServerPort;
     private _nextBackupTime;
     private _currentLobbyId;
     private _multiplayerLogs;
@@ -76,6 +77,7 @@ export default class Steamworks extends EventEmitter.Host<ISteamworksEvents> {
     isDedicatedServer(): boolean;
     getDedicatedServerInfo(): IDedicatedServerInfo | undefined;
     getMatchmakingServer(): IMatchmakingServer | undefined;
+    getMatchmakingServerPort(): number;
     getSteamNetworking(): ISteamworksNetworking | undefined;
     initialize(): Promise<IWaywardPreload | undefined>;
     enableSafePaths(): void;

package/definitions/game/ui/screen/screens/game/dialog/BookDialog.d.ts

@@ -16,7 +16,7 @@ export default class BookDialog extends Dialog {
     private book?;
     private readonly text;
     constructor();
-    getName(): import("../../../../../language/ITranslation").ISerializedTranslation | import("../../../../../language/impl/TranslationImpl").default | import("../../../../../language/dictionary/UiTranslation").default | undefined;
+    getName(): import("../../../../../language/impl/TranslationImpl").default | import("../../../../../language/ITranslation").ISerializedTranslation | import("../../../../../language/dictionary/UiTranslation").default | undefined;
     openBook(item: Item): void;
     private getText;
     protected onInventoryItemRemove(_: any, itemOrItems: Item | Item[]): void;

package/definitions/hosts/electron/main/launchOptions.d.ts

@@ -44,5 +44,6 @@ export interface ILaunchOptions {
     y: number | null;
     lastGameVersion: string;
     lastElectronVersion: string;
+    launcher?: true;
 }
 export declare const launchOptionsDefault: ILaunchOptions;

package/definitions/test/core/application.d.ts

@@ -8,20 +8,21 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { Load } from "../../game/game/meta/Loading";
-import type { Prompt } from "../../game/game/meta/prompt/IPrompt";
-import type { ScreenId } from "../../game/ui/screen/IScreen";
-import type { MenuId } from "../../game/ui/screen/screens/menu/component/IMenu";
-import type { Random } from "../../game/utilities/random/Random";
-import type { IAppPaths } from "../interfaces";
-import type { TestRunContext } from "../testRunner";
-import ApplicationInteractions from "./applicationInteractions";
-import type { Apps } from "./applicationManager";
+import type { Load } from "@wayward/game/game/meta/Loading";
+import type { Prompt } from "@wayward/game/game/meta/prompt/IPrompt";
+import type { ScreenId } from "@wayward/game/ui/screen/IScreen";
+import type { MenuId } from "@wayward/game/ui/screen/screens/menu/component/IMenu";
+import type { Random } from "@wayward/game/utilities/random/Random";
+import type { TestRunContext } from "@wayward/test/testRunner";
+import ApplicationInteractions from "@wayward/test/core/applicationInteractions";
+import type { Apps } from "@wayward/test/core/applicationManager";
+import type { IAppPaths } from "@wayward/test/interfaces";
 export interface IApplicationOptions {
     additionalArgs?: string[];
     mods?: string[];
     nodeJsMode?: boolean;
     random?: Random;
+    serverPort?: number;
 }
 export interface ITestState {
     seed: number;
@@ -38,9 +39,9 @@ export interface IApplicationState {
 /**
  * WebDriver client api: http://webdriver.io/api.html
  */
-export default class Application extends ApplicationInteractions {
+export declare class Application extends ApplicationInteractions {
     private readonly paths;
-    private readonly options;
+    readonly options: IApplicationOptions;
     private static readonly browsers;
     static get browserCount(): number;
     static stop(): Promise<void>;
@@ -64,5 +65,4 @@ export default class Application extends ApplicationInteractions {
     requestVideo(videoPath: string): void;
     private recordVideoFrame;
     private configureDirectories;
-    private getFreePort;
 }

package/definitions/test/core/applicationDom.d.ts

@@ -10,9 +10,9 @@
  */
 /// <reference types="webdriverio/async" />
 import type * as webdriverio from "webdriverio";
-import type ApplicationLogger from "./applicationLogger";
+import type { ApplicationLogger } from "@wayward/test/core/applicationLogger";
 export declare const defaultWaitTimeout: number;
-export default class ApplicationDom {
+export declare class ApplicationDom {
     private readonly browser;
     private readonly logger;
     constructor(browser: WebdriverIO.Browser, logger: ApplicationLogger);

package/definitions/test/core/applicationInteractions.d.ts

@@ -10,14 +10,14 @@
  */
 /// <reference types="webdriverio/async" />
 import type { TestRunContext } from "@wayward/test/testRunner";
-import type { IInit } from "../../game/Init";
-import type { Stat } from "../../game/game/entity/IStats";
-import type { IslandId } from "../../game/game/island/IIsland";
-import { Direction } from "../../game/utilities/math/Direction";
-import type { IDedicatedServerGameOptions, IJoinServerOptions, INewGameOptions, IWaitUntilGameLoadedOptions } from "../interfaces";
-import type { Random } from "../../game/utilities/random/Random";
-import ApplicationDom from "./applicationDom";
-import ApplicationLogger from "./applicationLogger";
+import type { IInit } from "@wayward/game/Init";
+import type { Stat } from "@wayward/game/game/entity/IStats";
+import type { IslandId } from "@wayward/game/game/island/IIsland";
+import { Direction } from "@wayward/game/utilities/math/Direction";
+import type { Random } from "@wayward/game/utilities/random/Random";
+import { ApplicationLogger } from "@wayward/test/core/applicationLogger";
+import { ApplicationDom } from "@wayward/test/core/applicationDom";
+import type { IWaitUntilGameLoadedOptions, IDedicatedServerGameOptions, INewGameOptions, ITestJoinServerOptions } from "@wayward/test/interfaces";
 export default class ApplicationInteractions {
     protected readonly testContext: TestRunContext;
     readonly appId: string;
@@ -75,7 +75,7 @@ export default class ApplicationInteractions {
     waitForGameEndScreen(isWinner: boolean): Promise<void>;
     returnToTitleScreen(): Promise<void>;
     getServerGameCode(): Promise<string>;
-    joinMultiplayerServer(gameCode: string, options: IJoinServerOptions, isDedicatedServer: boolean): Promise<void>;
+    joinMultiplayerServer(gameCode: string, options: ITestJoinServerOptions, isDedicatedServer: boolean): Promise<void>;
     pauseGame(): Promise<void>;
     unpauseGame(): Promise<void>;
     moveToIslandId(islandId: IslandId): Promise<void>;

package/definitions/test/core/applicationLogger.d.ts

@@ -10,7 +10,7 @@
  */
 /// <reference types="node" />
 import { EventEmitter } from "events";
-export default class ApplicationLogger extends EventEmitter {
+export declare class ApplicationLogger extends EventEmitter {
     private _logBlockIndentation;
     private readonly _logs;
     getLogs(): string[];

package/definitions/test/core/applicationManager.d.ts

@@ -8,11 +8,11 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type Player from "../../game/game/entity/player/Player";
-import { Direction } from "../../game/utilities/math/Direction";
-import type { IJoinServerOptions, INewGameOptions } from "../interfaces";
-import type Application from "./application";
-import type { ITestState } from "./application";
+import type Player from "@wayward/game/game/entity/player/Player";
+import { Direction } from "@wayward/game/utilities/math/Direction";
+import type { ITestState } from "@wayward/test/core/application";
+import type { INewGameOptions, ITestJoinServerOptions } from "@wayward/test/interfaces";
+import type { Application } from "@wayward/test/core/application";
 export declare class Apps {
     private readonly _logs;
     private readonly _applications;
@@ -49,7 +49,7 @@ export declare class Apps {
     get inactiveClients(): Application[];
     reset(): void;
     add(app: Application): Application;
-    addServer(app: Application): Application;
+    addServer(app: Application): Promise<Application>;
     addTARS(app: Application): Application;
     addConnectedClient(app: Application): Application;
     activateTARS(): () => void;
@@ -63,7 +63,7 @@ export declare class Apps {
     createMultiplayerGame(options: Omit<INewGameOptions, "playMode">): Promise<void>;
     setClientJoinIsland(x: number, y: number): Promise<void>;
     getServerGameCode(): Promise<string>;
-    joinServer(options: IJoinServerOptions, ...apps: Application[]): Promise<void>;
+    joinServer(options: ITestJoinServerOptions, ...apps: Application[]): Promise<void>;
     leaveServer(...apps: Application[]): Promise<void>;
     returnToTitleScreen(): Promise<void>;
     waitUntilLoadingIsFinished(): Promise<void>;
@@ -80,5 +80,4 @@ export declare class Apps {
     private bindApp;
     private log;
 }
-declare const _default: Apps;
-export default _default;
+export declare const appsContextKey = "APPS";

package/definitions/test/core/chromeDriver.d.ts

@@ -8,8 +8,8 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type ApplicationLogger from "./applicationLogger";
-export default class ChromeDriver {
+import type { ApplicationLogger } from "@wayward/test/core/applicationLogger";
+export declare class ChromeDriver {
     private readonly safeTestTile;
     private readonly appId;
     private readonly logger;

package/definitions/test/index.d.ts

@@ -13,5 +13,5 @@ declare const config: {
     randomInputCount: number;
     outputConsoleErrors: boolean;
 };
-export type Config = typeof config;
+export type TestConfig = typeof config;
 export {};

package/definitions/test/interfaces.d.ts

@@ -26,7 +26,7 @@ export interface INewGameOptions extends ICommonGameOptions {
     reuseCharacter?: boolean;
 }
 export type IDedicatedServerGameOptions = ICommonGameOptions;
-export interface IJoinServerOptions {
+export interface ITestJoinServerOptions {
     joinProgrammatically: boolean;
     enableAllMilestoneModifiers?: boolean;
     multiplayerIdentifier?: string;

package/definitions/test/suite/functionalTests/multiplayer/Multiplayer.spec.d.ts

@@ -8,6 +8,6 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { IPaths } from "../../../interfaces";
-import type { Config } from "../../..";
-export default function (paths: IPaths, config: Config): void;
+import type { TestConfig } from "@wayward/test";
+import type { IPaths } from "@wayward/test/interfaces";
+export default function (paths: IPaths, config: TestConfig): void;

package/definitions/test/suite/functionalTests/singleplayer/SaveImport.spec.d.ts

@@ -8,6 +8,6 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { IPaths } from "../../../interfaces";
-import type { Config } from "../../..";
-export default function (paths: IPaths, config: Config): void;
+import type { TestConfig } from "@wayward/test";
+import type { IPaths } from "@wayward/test/interfaces";
+export default function (paths: IPaths, config: TestConfig): void;

package/definitions/test/suite/functionalTests/singleplayer/Singleplayer.spec.d.ts

@@ -8,6 +8,6 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { IPaths } from "../../../interfaces";
-import type { Config } from "../../..";
-export default function (paths: IPaths, config: Config): void;
+import { type IPaths } from "@wayward/test/interfaces";
+import type { TestConfig } from "@wayward/test";
+export default function (paths: IPaths, config: TestConfig): void;

package/definitions/test/suite/unitTests/game/Actions.spec.d.ts

@@ -8,6 +8,6 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { IPaths } from "../../../interfaces";
-import type { Config } from "../../..";
-export default function (paths: IPaths, config: Config): void;
+import type { IPaths } from "@wayward/test/interfaces";
+import type { TestConfig } from "@wayward/test";
+export default function (paths: IPaths, config: TestConfig): void;

package/definitions/test/suite/unitTests/game/Island.spec.d.ts

@@ -8,6 +8,6 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { IPaths } from "../../../interfaces";
-import type { Config } from "../../..";
-export default function (paths: IPaths, config: Config): void;
+import type { TestConfig } from "@wayward/test";
+import type { IPaths } from "@wayward/test/interfaces";
+export default function (paths: IPaths, config: TestConfig): void;

package/definitions/test/suite/unitTests/utilities/KdTree.spec.d.ts

@@ -8,6 +8,6 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { IPaths } from "../../../interfaces";
-import type { Config } from "../../..";
-export default function (paths: IPaths, config: Config): void;
+import type { TestConfig } from "@wayward/test";
+import type { IPaths } from "@wayward/test/interfaces";
+export default function (paths: IPaths, config: TestConfig): void;

package/definitions/test/suite/unitTests/utilities/MagicalPropertyManager.spec.d.ts

@@ -8,6 +8,6 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { IPaths } from "../../../interfaces";
-import type { Config } from "../../..";
-export default function (paths: IPaths, config: Config): void;
+import type { TestConfig } from "@wayward/test";
+import type { IPaths } from "@wayward/test/interfaces";
+export default function (paths: IPaths, config: TestConfig): void;

package/definitions/test/testRunner.d.ts

@@ -31,8 +31,14 @@ export interface ITest {
 }
 declare abstract class BaseContext {
     private _timeoutMilliseconds?;
+    private _parallel?;
+    private _retries?;
     get timeout(): number | undefined;
     set timeout(value: number | undefined);
+    get parallel(): number | undefined;
+    set parallel(value: number | undefined);
+    get retries(): number | undefined;
+    set retries(value: number | undefined);
 }
 export declare class TestSetupContext extends BaseContext {
     readonly title: string;
@@ -105,10 +111,11 @@ export declare class TestSetupContext extends BaseContext {
      * Runs tests
      */
     private runTests;
+    private runTest;
     /**
      * Runs a test
      */
-    private runTest;
+    private executeTest;
     private logNoDepth;
 }
 export declare class TestRunContext extends BaseContext {
@@ -126,6 +133,7 @@ export declare class TestRunContext extends BaseContext {
     private _output;
     private readonly _errors;
     private readonly _attachments;
+    private readonly _data;
     private readonly startTime;
     private endTime;
     private duration;
@@ -187,10 +195,14 @@ export declare class TestRunContext extends BaseContext {
      * Adds an attachment to the test result
      */
     addAttachment(attachmentName: string, attachmentData: ITestAttachmentData): Promise<void>;
+    getData<T = unknown>(key: string): T;
+    tryGetData<T = unknown>(key: string): T | undefined;
+    setData<T = unknown>(key: string, value: T): T;
+    start(): void;
     /**
      * Mark the context as being completed (finished running)
      */
-    complete(): void;
+    end(): void;
     /**
      * https://docs.nunit.org/articles/nunit/technical-notes/usage/Test-Result-XML-Format.html
      */

package/definitions/test/util/helpers.d.ts

@@ -8,5 +8,5 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { IDifferences } from "../../game/utilities/object/JsonHelper";
+import type { IDifferences } from "@wayward/game/utilities/object/JsonHelper";
 export declare function compileDifferences(client: string | number, differences: IDifferences): string;

package/definitions/test/util/ports.d.ts

@@ -0,0 +1,11 @@
+/*!
+ * Copyright 2011-2021 Unlok
+ * https://www.unlok.ca
+ *
+ * Credits & Thanks:
+ * https://www.unlok.ca/credits-thanks/
+ *
+ * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
+ * https://github.com/WaywardGame/types/wiki
+ */
+export declare function getFreePort(): Promise<number>;

package/definitions/test/util/random.d.ts

@@ -8,6 +8,6 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { Random } from "../../game/utilities/random/Random";
+import type { Random } from "@wayward/game/utilities/random/Random";
 export declare function createRandom(appId: string): Random;
 export declare function getSeed(): number;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@wayward/types",
 	"description": "TypeScript declarations for Wayward, used for modding.",
-	"version": "2.13.0-beta.dev.20230430.2",
+	"version": "2.13.0-beta.dev.20230502.1",
 	"license": "MIT",
 	"repository": {
 		"type": "git",

package/definitions/game/ui/old/functional/IFunctionalTooltip.d.ts

@@ -1,37 +0,0 @@
-/*!
- * Copyright 2011-2021 Unlok
- * https://www.unlok.ca
- *
- * Credits & Thanks:
- * https://www.unlok.ca/credits-thanks/
- *
- * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
- * https://github.com/WaywardGame/types/wiki
- */
-export interface ITooltipOptions {
-    selector: string;
-    disabled?: boolean;
-    trackMouse?: boolean;
-    position?: ITooltipPosition;
-    content(): string;
-    onOpen?(target: JQuery): void;
-    onClose?(target: JQuery): void;
-}
-export interface ITooltip extends ITooltipOptions {
-    visible?: HTMLElement;
-    lastEvent: string;
-    element: HTMLElement;
-    width: number;
-    height: number;
-    show(event: MouseEvent | undefined): void;
-    updateTooltipPosition(left: number, top: number, mouseX?: number, mouseY?: number): void;
-}
-export interface ITooltipPosition {
-    startAtRight?: boolean;
-    startAtBottom?: boolean;
-    centerX?: boolean;
-    centerY?: boolean;
-    leftOffset?: number;
-    topOffset?: number;
-    clampRight?: boolean;
-}