@wayward/types 2.13.0-beta.dev.20230414.1 → 2.13.0-beta.dev.20230416.1

package/definitions/game/event/EventEmitter.d.ts

@@ -44,7 +44,6 @@ type Handler<H, F> = (host: H, ...args: ArgsOf<F>) => ReturnOf<F>;
 type WeakHandler<H, F> = WeakRef<Handler<H, F>>;
 type UndefinedFromVoid<V> = V extends void ? undefined : V;
 export interface IEventEmitter<H = any, E = any> {
-    event: IEventEmitter<this, IEventEmitterEvents<H, E>>;
     emit<K extends keyof E>(event: K, ...args: ArgsOf<E[K]>): H;
     /**
      * Emit an event only to the subscribers of this emitter instance.
@@ -70,17 +69,11 @@ export interface IEventEmitter<H = any, E = any> {
 export interface IUntilSubscriber<H, E> {
     subscribe<K extends ArrayOr<keyof E>>(event: K, handler: IterableOr<Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>>, priority?: number): H;
 }
-interface IEventEmitterEvents<H, E> {
-    subscribe<K extends keyof E>(event: keyof E, handler: Iterable<(keyof H) | Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>>): any;
-    unsubscribe<K extends keyof E>(event: keyof E, handler: Iterable<(keyof H) | Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>>): any;
-}
-declare class EventEmitter<H, E> implements IEventEmitter<H, E> {
+declare class EventEmitter<H, E> {
     private readonly host;
     private readonly hostClass;
     private readonly subscriptions;
     private readonly cachedEmitSelfHandlers;
-    private eventEmitterMeta?;
-    get event(): IEventEmitter<this, IEventEmitterEvents<H, E>>;
     constructor(host: H);
     raw(): IEventEmitter<H, E>;
     emitSelf<K extends keyof E>(event: K, ...args: ArgsOf<E[K]>): H;

package/definitions/game/game/doodad/Doodad.d.ts

@@ -85,6 +85,7 @@ export default class Doodad extends Entity<IDoodadDescription, DoodadType, Dooda
     minDur: number;
     private fireStage?;
     aberrant?: boolean;
+    bonusAttack?: number;
     builderIdentifier?: string;
     containedItems?: Item[];
     crafterIdentifier?: string;
@@ -104,7 +105,6 @@ export default class Doodad extends Entity<IDoodadDescription, DoodadType, Dooda
     stillContainer?: Item;
     tradedFrom?: string[];
     weight?: number;
-    bonusAttack?: number;
     private _tileId?;
     /**
      * Separate property just for wells because isInGroup is still expensive for processWell()

package/definitions/game/game/entity/EntityMovable.d.ts

@@ -117,4 +117,5 @@ export default abstract class EntityMovable<DescriptionType = unknown, TypeType
     get isFlying(): boolean;
     getMoveType(): MoveType;
     setMoveType(moveType: MoveType): void;
+    canSwapWith(entity: EntityMovable, source: string | undefined): boolean;
 }

package/definitions/game/game/entity/Human.d.ts

@@ -47,6 +47,7 @@ import type Tile from "game/tile/Tile";
 import type { ICanSailAwayResult } from "game/tile/Tile";
 import type TileEvent from "game/tile/TileEvent";
 import Message from "language/dictionary/Message";
+import type { ISerializedTranslation } from "language/ITranslation";
 import Translation from "language/Translation";
 import type FieldOfView from "renderer/fieldOfView/FieldOfView";
 import { CanASeeBType } from "renderer/fieldOfView/IFieldOfView";
@@ -72,7 +73,7 @@ export default abstract class Human<TypeType extends number = number> extends En
     fromY: number;
     crafted: Record<number, ICrafted>;
     customization: ICustomizations;
-    deathBy: import("language/ITranslation").ISerializedTranslation;
+    deathBy: ISerializedTranslation;
     defense: PlayerDefense;
     defenses: number[];
     equippedOffHandDisabled?: ItemReference;

package/definitions/game/game/entity/IEntity.d.ts

@@ -291,7 +291,8 @@ export interface IMoveToOptions {
 }
 export declare enum MoveAnimation {
     Normal = 0,
-    Jump = 1
+    Jump = 1,
+    Teleport = 2
 }
 export declare enum MoveFlag {
     None = 0,

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

@@ -78,7 +78,8 @@ export declare const actionDescriptionsSlow: {
     84: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, {
         usable: true;
     }, [import("../../item/Item").default]>;
-    118: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.Player], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [import("../player/Player").default]>;
+    118: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.Human], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [import("../Human").default<number>]>;
+    125: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.NPCNearby, [import("game/entity/action/IAction").ActionArgument.Undefined, import("game/entity/action/IAction").ActionArgument.Integer32]], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [import("../npc/NPC").default, (number | undefined)?]>;
     55: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/Offer").IOfferCanUse, [import("../../item/Item").default]>;
     31: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default<number>, void, {
         usable: true;
@@ -125,7 +126,7 @@ export declare const actionDescriptionsSlow: {
     122: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.Integer32], import("../Human").default<number>, void, import("game/entity/action/actions/SetCreatureAi").ISetCreatureAiCanUse, [number]>;
     6: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/SetDown").ISetDownCanUse, [import("../../item/Item").default]>;
     123: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.Undefined, import("game/entity/action/IAction").ActionArgument.Integer32]], import("../player/Player").default, void, import("game/entity/action/IAction").IActionUsable, [(number | undefined)?]>;
-    119: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.NPCNearby, [import("game/entity/action/IAction").ActionArgument.Island, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Integer32, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/ShipToIsland").IShipToIslandCanUse, [import("../npc/NPC").default, (import("../../island/Island").default | undefined)?, (number | undefined)?]>;
+    119: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.NPCNearby, [import("game/entity/action/IAction").ActionArgument.Island, import("game/entity/action/IAction").ActionArgument.Vector2, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Integer32, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/ShipToIsland").IShipToIslandCanUse, [import("../npc/NPC").default, (import("../../island/Island").default | import("../../../utilities/math/IVector").IVector2 | undefined)?, (number | undefined)?]>;
     94: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/Shoot").IShootCanUse, [import("../../item/Item").default]>;
     11: 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("game/entity/action/IAction").ActionArgument.RestType, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Rest").IRestCanUse, [(import("../../doodad/Doodad").default | import("../../item/Item").default | undefined)?, (import("../IHuman").RestType | undefined)?]>;
     72: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<number>, void, import("game/entity/action/actions/SmotherFire").ISmotherFireCanUse, [import("../../item/Item").default]>;
@@ -164,5 +165,4 @@ export declare const actionDescriptionsSlow: {
     105: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.String, import("game/entity/action/IAction").ActionArgument.Object], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [string, any?]>;
     107: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.Vector2Array, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Boolean, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [(import("../../../utilities/math/IVector").IVector2[] | undefined)?, (boolean | undefined)?]>;
     92: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby, [import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default<number>, void, import("game/entity/action/actions/Upgrade").IUpgradeCanUse, [import("../../item/Item").default, (import("../../item/Item").default | undefined)?]>;
-    125: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.NPCNearby, [import("game/entity/action/IAction").ActionArgument.Undefined, import("game/entity/action/IAction").ActionArgument.Integer32]], import("../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [import("../npc/NPC").default, (number | undefined)?]>;
 };

package/definitions/game/game/entity/action/actions/Noclip.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.Player], import("../../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [import("../../player/Player").default]>;
+declare const _default: Action<[ActionArgument.Human], import("../../Human").default<number>, void, import("game/entity/action/IAction").IActionUsable, [import("../../Human").default<number>]>;
 export default _default;

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

@@ -14,11 +14,13 @@ import type { IActionUsable } from "game/entity/action/IAction";
 import { ActionArgument } from "game/entity/action/IAction";
 import type ShipperNPC from "game/entity/npc/npcs/Shipper";
 import type { IIslandPort } from "game/island/IIsland";
+import type Island from "game/island/Island";
 import type { IVector2 } from "utilities/math/IVector";
 export interface IShipToIslandCanUse extends IActionUsable {
     shipper: ShipperNPC;
     path?: IVector2[];
     port?: IIslandPort;
+    island?: Island;
 }
-declare const _default: Action<[ActionArgument.NPCNearby, [ActionArgument.Island, ActionArgument.Undefined], [ActionArgument.Integer32, ActionArgument.Undefined]], Human<number>, void, IShipToIslandCanUse, [import("../../npc/NPC").default, (import("../../../island/Island").default | undefined)?, (number | undefined)?]>;
+declare const _default: Action<[ActionArgument.NPCNearby, [ActionArgument.Island, ActionArgument.Vector2, ActionArgument.Undefined], [ActionArgument.Integer32, ActionArgument.Undefined]], Human<number>, void, IShipToIslandCanUse, [import("../../npc/NPC").default, (Island | IVector2 | undefined)?, (number | undefined)?]>;
 export default _default;

package/definitions/game/game/entity/action/usable/actions/UsableActionsWorld.d.ts

@@ -17,7 +17,7 @@ export declare enum WorldContextMenuClasses {
     OptionText = "world-context-menu-option-text"
 }
 export declare namespace WorldContextMenuClasses {
-    const OptionSpecific: (enumValue: UsableActionType) => "world-context-menu-option-none" | "world-context-menu-option-actions" | "world-context-menu-option-use" | "world-context-menu-option-move" | "world-context-menu-option-commandattack" | "world-context-menu-option-commanddefend" | "world-context-menu-option-commandfollowclose" | "world-context-menu-option-commandfollowfar" | "world-context-menu-option-commandstay" | "world-context-menu-option-digwithhands" | "world-context-menu-option-dropall" | "world-context-menu-option-dropallofsamequality" | "world-context-menu-option-gatherwithhands" | "world-context-menu-option-harvestwithhands" | "world-context-menu-option-movetoinventory" | "world-context-menu-option-pickupexcrementwithhands" | "world-context-menu-option-restonground" | "world-context-menu-option-tillwithhands" | "world-context-menu-option-quickslotremove" | "world-context-menu-option-quickslotadd" | "world-context-menu-option-quickslotaddtofree" | "world-context-menu-option-quickslotaddtoslot" | "world-context-menu-option-dropmenu" | "world-context-menu-option-repairwithitem" | "world-context-menu-option-reinforcewithitem" | "world-context-menu-option-enhancewithitem" | "world-context-menu-option-enchantwithitem" | "world-context-menu-option-transmogrifywithitem" | "world-context-menu-option-upgradewithitem" | "world-context-menu-option-alterwithitem" | "world-context-menu-option-refinewithitem" | "world-context-menu-option-preservewithitem" | "world-context-menu-option-addfuelwithitem" | "world-context-menu-option-ignitewithitem" | "world-context-menu-option-absorbwithitem" | "world-context-menu-option-exudewithitem" | "world-context-menu-option-movetoinventorymenu" | "world-context-menu-option-movetoactivecontainermenu" | "world-context-menu-option-movetofacingcontainermenu" | "world-context-menu-option-moveall" | "world-context-menu-option-moveallofsamequality" | "world-context-menu-option-tradetradersell" | "world-context-menu-option-tradetraderbuy" | "world-context-menu-option-itemactions" | "world-context-menu-option-equipheld" | "world-context-menu-option-equiplegs" | "world-context-menu-option-equipchest" | "world-context-menu-option-equiphead" | "world-context-menu-option-equipwaist" | "world-context-menu-option-equipfeet" | "world-context-menu-option-equipneck" | "world-context-menu-option-equiphands" | "world-context-menu-option-equipback" | "world-context-menu-option-equipmainhand" | "world-context-menu-option-equipoffhand" | "world-context-menu-option-sleeponground" | "world-context-menu-option-commandmenu";
+    const OptionSpecific: (enumValue: UsableActionType) => "world-context-menu-option-none" | "world-context-menu-option-actions" | "world-context-menu-option-move" | "world-context-menu-option-use" | "world-context-menu-option-commandattack" | "world-context-menu-option-commanddefend" | "world-context-menu-option-commandfollowclose" | "world-context-menu-option-commandfollowfar" | "world-context-menu-option-commandstay" | "world-context-menu-option-quickslotremove" | "world-context-menu-option-quickslotadd" | "world-context-menu-option-quickslotaddtofree" | "world-context-menu-option-quickslotaddtoslot" | "world-context-menu-option-movetoinventory" | "world-context-menu-option-dropmenu" | "world-context-menu-option-dropall" | "world-context-menu-option-dropallofsamequality" | "world-context-menu-option-repairwithitem" | "world-context-menu-option-reinforcewithitem" | "world-context-menu-option-enhancewithitem" | "world-context-menu-option-enchantwithitem" | "world-context-menu-option-transmogrifywithitem" | "world-context-menu-option-upgradewithitem" | "world-context-menu-option-alterwithitem" | "world-context-menu-option-refinewithitem" | "world-context-menu-option-preservewithitem" | "world-context-menu-option-addfuelwithitem" | "world-context-menu-option-ignitewithitem" | "world-context-menu-option-absorbwithitem" | "world-context-menu-option-exudewithitem" | "world-context-menu-option-movetoinventorymenu" | "world-context-menu-option-movetoactivecontainermenu" | "world-context-menu-option-movetofacingcontainermenu" | "world-context-menu-option-moveall" | "world-context-menu-option-moveallofsamequality" | "world-context-menu-option-tradetradersell" | "world-context-menu-option-tradetraderbuy" | "world-context-menu-option-itemactions" | "world-context-menu-option-gatherwithhands" | "world-context-menu-option-harvestwithhands" | "world-context-menu-option-digwithhands" | "world-context-menu-option-tillwithhands" | "world-context-menu-option-pickupexcrementwithhands" | "world-context-menu-option-equipheld" | "world-context-menu-option-equiplegs" | "world-context-menu-option-equipchest" | "world-context-menu-option-equiphead" | "world-context-menu-option-equipwaist" | "world-context-menu-option-equipfeet" | "world-context-menu-option-equipneck" | "world-context-menu-option-equiphands" | "world-context-menu-option-equipback" | "world-context-menu-option-equipmainhand" | "world-context-menu-option-equipoffhand" | "world-context-menu-option-restonground" | "world-context-menu-option-sleeponground" | "world-context-menu-option-commandmenu";
 }
 export declare const UsableActionsWorldActions: UsableActionGenerator<[]>;
 export declare const UsableActionsWorldItemActions: UsableActionGenerator<[]>;

package/definitions/game/game/entity/action/usable/actions/doodad/IUsableActionsDoodad.d.ts

@@ -15,10 +15,10 @@ declare namespace IUsableActionsDoodad {
     function getUnder(player: Player, filter?: (doodad: Doodad) => any): Doodad | undefined;
     function getUnderOrFacing(player: Player, filter?: (doodad: Doodad) => any): Doodad | undefined;
     function validate(player: Player, doodad: Doodad | undefined): doodad is Doodad;
-    const requireFacing: (filter?: ((doodad: Doodad) => any) | undefined) => {
+    const requireFacing: (filter?: ((doodad: Doodad, player: Player) => any) | undefined) => {
         find: (player: Player) => Doodad | undefined;
     };
-    const requireUnderOrFacing: (filter?: ((doodad: Doodad) => any) | undefined) => {
+    const requireUnderOrFacing: (filter?: ((doodad: Doodad, player: Player) => any) | undefined) => {
         find: (player: Player) => Doodad | undefined;
     };
 }

package/definitions/game/game/entity/creature/Creature.d.ts

@@ -10,7 +10,7 @@
  */
 import { SfxType } from "audio/IAudio";
 import type { IEventEmitter } from "event/EventEmitter";
-import type { CreatureAttackOutcome, CreatureType, ICreatureAttackOutcomeAttack, ICreatureDescription, ICreatureEvents, IDamageInfo, IHitch } from "game/entity/creature/ICreature";
+import type { CreatureAttackOutcome, CreatureType, ICreatureAttackOutcomeAttack, ICreatureCheckMoveOptions, ICreatureDescription, ICreatureEvents, IDamageInfo, IHitch } from "game/entity/creature/ICreature";
 import EntityWithStats from "game/entity/EntityWithStats";
 import type Human from "game/entity/Human";
 import type { IEntityConstructorOptions, IStatChangeInfo } from "game/entity/IEntity";
@@ -89,6 +89,7 @@ export default class Creature extends EntityWithStats<ICreatureDescription, Crea
     canTarget(target: Human | Creature | undefined): boolean;
     moveToIsland(targetTile: Tile, owner: Human): void;
     restore(targetTile: Tile, preventRendering?: boolean): void;
+    skipNextUpdate(): void;
     overrideNextMovement(tile: Tile): void;
     preventNextMovement(): void;
     checkForBurn(moveType?: MoveType): boolean;
@@ -105,7 +106,6 @@ export default class Creature extends EntityWithStats<ICreatureDescription, Crea
     getEnemy(): Human | Creature | undefined;
     setEnemy(enemy: Human | Creature | undefined): void;
     private incrementEnemyAttempts;
-    skipNextUpdate(): void;
     getMoveType(): MoveType;
     queueSoundEffect(type: SfxType, delay?: number, speed?: number): void;
     update(playingHumans: Human[]): boolean;
@@ -155,7 +155,7 @@ export default class Creature extends EntityWithStats<ICreatureDescription, Crea
      * @param willMove Set to true if the object is about to move to this tile. This method will confirm if theres an existing npc/creature there and return false if so
      * @returns 0 if the creature can move, otherwise an error code
      */
-    checkCreatureMove(isClientside: boolean, tile: Tile, moveType: MoveType, willMove: boolean, ignoreHuman?: Human, ignoreScareCrow?: boolean): number;
+    checkCreatureMove(isClientside: boolean, tile: Tile, moveType: MoveType, willMove: boolean, options?: Partial<ICreatureCheckMoveOptions>): number;
     /**
      * Returns the times a creature has been tamed.
      * @returns number if the creature has been tamed and undefined if it has never been tamed.

package/definitions/game/game/entity/creature/CreatureManager.d.ts

@@ -11,6 +11,7 @@
 import type { Events, IEventEmitter } from "event/EventEmitter";
 import CombatStrengthManager from "game/entity/CombatStrengthManager";
 import Creature from "game/entity/creature/Creature";
+import type { ICreatureCheckMoveOptions } from "game/entity/creature/ICreature";
 import { CreatureType, SpawnGroup, TileGroup } from "game/entity/creature/ICreature";
 import EntityManager from "game/entity/EntityManager";
 import type Human from "game/entity/Human";
@@ -70,7 +71,7 @@ export default class CreatureManager extends EntityManager<Creature> {
      * @param willMove Set to true if the object is about to move to this tile. This method will confirm if theres an existing npc/creature there and return false if so
      * @return Blocked penalty - Do no return 0!
      */
-    getMovePenalty(moveType: MoveType, tile: Tile, willMove: boolean, ignoreHuman?: Human): number;
+    getMovePenalty(moveType: MoveType, tile: Tile, willMove: boolean, options?: Partial<ICreatureCheckMoveOptions>): number;
     /**
      * wasm calls this when calculating penalties for flow fields
      */

package/definitions/game/game/entity/creature/ICreature.d.ts

@@ -421,3 +421,8 @@ export interface ICreatureAttackOutcomeAttack extends ICreatureAttackOutcomeBase
     damageScale: number;
 }
 export type CreatureAttackOutcome = ICreatureAttackOutcomeNoAttack | ICreatureAttackOutcomeHidden | ICreatureAttackOutcomeAttack;
+export interface ICreatureCheckMoveOptions {
+    ignoreHuman: Human;
+    ignoreScareCrow: boolean;
+    ignoreMoveTypeNone: boolean;
+}

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

@@ -48,6 +48,7 @@ export default abstract class NPC extends Human<NPCType> {
     weightCapacity: number;
     properties?: IProperties;
     talked?: Set<string>;
+    private shouldSkipNextUpdate?;
     static getRegistrarId(): number;
     static setRegistrarId(id: number): void;
     constructor(entityOptions?: IEntityConstructorOptions<NPCType>);
@@ -84,6 +85,12 @@ export default abstract class NPC extends Human<NPCType> {
     isWaiting(): boolean;
     getDamageModifier(): number;
     makeHostile(): void;
+    /**
+     * Allow swapping with npcs
+     */
+    canSwapWith(human: Human, source: string | undefined): boolean;
+    skipNextUpdate(): void;
+    overrideNextMovement(tile: Tile): void;
     getPublicContainer(): IContainer | undefined;
     /**
      * The actions available to use with this npc
@@ -149,7 +156,7 @@ export default abstract class NPC extends Human<NPCType> {
     protected changeZ(toZ: number, fromZ: number): boolean | void | undefined;
     protected updateTile(fromTile: Tile, toTile: Tile): boolean;
     protected postMove(): void;
-    canMoveToTile(moveType: MoveType, tile: Tile): -1 | 0 | -2 | -3 | -4 | -5 | -6;
+    canMoveToTile(moveType: MoveType, tile: Tile, ignoreHuman?: Human): -1 | 0 | -2 | -3 | -4 | -5 | -6;
     getWeightOrStaminaMovementPenalty(): number;
     get asMerchant(): MerchantNPC | undefined;
     get asShipper(): ShipperNPC | undefined;

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

@@ -13,6 +13,7 @@ import type { IEntityCanCreateOptions } from "game/entity/EntityManager";
 import EntityManager from "game/entity/EntityManager";
 import type { NPCType } from "game/entity/npc/INPCs";
 import NPC from "game/entity/npc/NPC";
+import type ShipperNPC from "game/entity/npc/npcs/Shipper";
 import type Tile from "game/tile/Tile";
 export interface INPCCanCreateOptions extends IEntityCanCreateOptions {
     uniqueNpcType?: string;
@@ -44,4 +45,8 @@ export default class NPCManager extends EntityManager<NPC> {
     addPlayerLike(npc: NPC): void;
     removePlayerLike(npc: NPC): void;
     updateAll(): void;
+    /**
+     * Get an array of shippers that are in the process of shipping things to another island
+     */
+    getPendingOutboundShippers(): ShipperNPC[];
 }

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

@@ -15,7 +15,7 @@ import { AiType, MoveType } from "game/entity/IEntity";
 import { EquipType } from "game/entity/IHuman";
 import type { INPCConstructorOptions } from "game/entity/npc/INPC";
 import NPC from "game/entity/npc/NPC";
-import type { IIslandPort } from "game/island/IIsland";
+import type { IIslandPort, IslandId } from "game/island/IIsland";
 import type Island from "game/island/Island";
 import type { IContainer } from "game/item/IItem";
 import { ItemType } from "game/item/IItem";
@@ -26,8 +26,12 @@ export declare enum ShipperNPCInteractType {
     OpenContainer = 0,
     ShipToIsland = 1
 }
+interface IShipTarget {
+    islandId: IslandId;
+    portId: number;
+}
 export default class ShipperNPC extends NPC {
-    private shipTarget;
+    shipTarget: IShipTarget | undefined;
     private nearbyPortId;
     constructor(options?: INPCConstructorOptions);
     spawn(): void;
@@ -39,6 +43,7 @@ export default class ShipperNPC extends NPC {
      * Closes container dialogs
      */
     closeContainerDialogs(): void;
+    canSailTo(x: number, y: number): boolean;
     getPublicContainer(): IContainer | undefined;
     protected getReputationChangeOnDeath(): number;
     protected getDefaultName(): import("../../../../language/impl/TranslationImpl").default;
@@ -55,7 +60,8 @@ export default class ShipperNPC extends NPC {
     get asMerchant(): undefined;
     get asShipper(): ShipperNPC;
     getShipContainerItem(): (Item & IContainer) | undefined;
-    canMoveToTile(moveType: MoveType, tile: Tile): -1 | 0 | -2 | -3 | -4 | -5 | -6;
+    canMoveToTile(moveType: MoveType, tile: Tile, ignoreHuman?: Human): -1 | 0 | -2 | -3 | -4 | -5 | -6;
     shipToPort(island: Island, port: IIslandPort, pathToEdge: IVector2[]): void;
     private moveToPort;
 }
+export {};

package/definitions/game/game/entity/player/PlayerManager.d.ts

@@ -66,7 +66,7 @@ export default class PlayerManager extends EventEmitter.Host<IPlayerManagerEvent
      * Support loading single player saves in dedicated servers
      * All while not losing data for any players - regardless of if the player was in the server or not at the time of the backup
      */
-    repair(options: Partial<IPlayOptions>): void;
+    repair(options: Partial<IPlayOptions>): Promise<void>;
     /**
      * Removes and deletes a player.
      * Use with caution!

package/definitions/game/game/entity/player/quest/quest/Challenge.d.ts

@@ -41,6 +41,11 @@ export default class Challenge extends Quest {
     protected createRequirements(island: Island): Array<IQuestRequirement<any, any>>;
     protected onUpdate(quest: QuestInstance): void;
     protected onRequirementComplete(quest: QuestInstance, completedRequirement: RequirementInstance): void;
+    /**
+     *
+     * @param island
+     * @returns Technically a IQuestRequirement<any, any>, but specifying the exact types makes the typing much faster
+     */
     private createRandomRequirement;
     private getSpawnableCreatures;
 }

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

@@ -141,7 +141,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 | Iterable<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 | Iterable<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/Inspection.d.ts

@@ -20,9 +20,7 @@ import type { IVector3 } from "utilities/math/IVector";
 export default abstract class Inspection<O> extends InfoProvider {
     readonly type: InspectType;
     readonly value: O;
-    static createEnumReferenceHandler<R extends ReferenceType, E, K extends string>(referenceType: R, enumObject: {
-        [key in K]: E;
-    }, predicate?: (reference: [R, E], context?: InfoProviderContext) => any): (type: InspectType, value: unknown, context?: InfoProviderContext) => boolean;
+    static createEnumReferenceHandler<R extends ReferenceType, E, K extends string>(referenceType: R, enumObject: Record<K, E>, predicate?: (reference: [R, E], context?: InfoProviderContext) => any): (type: InspectType, value: unknown, context?: InfoProviderContext) => boolean;
     static createAnyHandler(...handlers: Array<Exclude<InspectionClass["handles"], undefined>>): (type: InspectType, ...args: any[]) => boolean;
     static createReferenceHandler<REFTYPE extends EnumReferenceTypes>(referenceType: REFTYPE, handler?: (resolvedReference: EnumReferenceResolved<REFTYPE>, context?: InfoProviderContext) => any): (type: InspectType, value: unknown, context?: InfoProviderContext) => boolean;
     static verifyHumanity(_: any, context?: InfoProviderContext): boolean;

package/definitions/game/game/island/IIsland.d.ts

@@ -113,6 +113,7 @@ export interface IIslandLoadOptions {
     pauseAndShowLoadingScreen?: boolean;
     multiplayerLoadingDescription?: MultiplayerLoadingDescription;
     newIslandOverrides?: Partial<INewIslandOverrides>;
+    disableLoadingScreen?: boolean;
 }
 export interface IMoveToIslandOptions {
     spawnPosition: IVector2;
@@ -122,6 +123,8 @@ export interface IMoveToIslandOptions {
     respawn: boolean;
     newIslandOverrides: Partial<INewIslandOverrides>;
     targetPortId: number;
+    disableLoadingScreen: boolean;
+    nestedTravelCount: number;
 }
 export interface INewIslandOverrides {
     biomeType: BiomeType;

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

@@ -66,22 +66,22 @@ export interface IItemManagerEvents {
 }
 export default class ItemManager extends ObjectManager<Item, IItemManagerEvents> {
     readonly worldContainer: IContainer;
-    private static cachedBestItemForTier;
-    private static cachedDefaultItemForGroup;
-    private static cachedEquippables;
-    private static cachedHighestItemActionTierForAction;
-    private static cachedItemGroups;
     private static cachedItemTypeGroups;
     private static cachedItemTypes;
     private static cachedItemTypesWithRecipes;
-    private static cachedWeights;
+    private static cachedUseItemActions;
+    private static readonly cachedBestItemForTier;
+    private static readonly cachedDefaultItemForGroup;
+    private static readonly cachedEquippables;
     private static readonly cachedGroupItems;
+    private static readonly cachedHighestItemActionTierForAction;
+    private static readonly cachedItemGroups;
     private static readonly cachedItemGroupsUsedInRecipes;
     private static readonly cachedItemsThatAreAcceptedAsOffer;
     private static readonly cachedItemsThatAreUsedForGrowingPlants;
     private static readonly cachedItemsThatAreUsedInRecipes;
-    private static cachedUseItemActions;
-    static cachedItemSpawns: OptionalDescriptions<BiomeType, OptionalDescriptions<WorldZ, OptionalDescriptions<TerrainType, ItemType[]>>>;
+    private static readonly cachedWeights;
+    static readonly cachedItemSpawns: Map<BiomeType, OptionalDescriptions<WorldZ, OptionalDescriptions<TerrainType, ItemType[]>>>;
     static getItemTypes(): readonly ItemType[];
     static getItemsWithRecipes(): readonly ItemType[];
     static getBestItemForTier(item: ItemType | ItemTypeGroup): ItemType | undefined;

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

@@ -312,116 +312,7 @@ export type DictionaryEntryEnums = {
     [DICTIONARY in keyof typeof dictionaryMap]: (typeof dictionaryMap)[DICTIONARY] extends infer ENTRY_ENUM ? ENTRY_ENUM[keyof ENTRY_ENUM] : never;
 };
 declare function getByEnum(enumObject: DictionaryEnum): Dictionary;
-declare const dictionaries: {
-    0: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    1: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    2: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    3: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    4: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    5: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    6: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    7: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    8: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    9: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    10: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    11: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    12: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    13: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    14: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    15: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    16: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    17: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    18: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    19: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    20: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    21: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    22: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    23: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    24: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    25: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    26: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    27: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    28: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    29: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    30: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    31: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    32: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    33: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    34: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    35: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    36: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    37: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    38: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    39: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    40: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    41: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    42: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    43: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    44: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    45: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    46: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    47: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    48: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    49: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    50: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    51: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    52: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    53: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    54: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    55: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    56: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    57: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    58: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    59: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    60: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    61: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    62: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    63: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    64: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    65: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    66: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    67: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    68: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    69: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    70: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    71: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    72: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    73: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    74: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    75: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    76: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    77: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    78: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    79: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    80: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    81: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    82: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    83: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    84: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    85: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    86: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    87: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    88: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    89: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    90: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    91: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    92: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    93: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    94: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    95: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    96: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    97: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    98: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    99: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    100: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    101: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    102: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    103: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    104: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    105: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    106: typeof SYMBOL_ANY_DICTIONARY | Enum;
-    107: typeof SYMBOL_ANY_DICTIONARY | Enum;
-} & Record<number, typeof SYMBOL_ANY_DICTIONARY | Enum | undefined> & {
+declare const dictionaries: Record<Dictionary, typeof SYMBOL_ANY_DICTIONARY | Enum> & Record<number, typeof SYMBOL_ANY_DICTIONARY | Enum | undefined> & {
     getByEnum: typeof getByEnum;
 };
 export default dictionaries;