@wayward/types 2.13.0-beta.dev.20230331.1 → 2.13.0-beta.dev.20230401.1

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

@@ -43,6 +43,10 @@ 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.
+     */
+    emitSelf<K extends keyof E>(event: K, ...args: ArgsOf<E[K]>): H;
     emitFirst<K extends keyof E>(event: K, ...args: ArgsOf<E[K]>): UndefinedFromVoid<ReturnOf<E[K]>> | undefined;
     emitFirstDefault<K extends keyof E, D>(event: K, generateDefault: () => D, ...args: ArgsOf<E[K]>): Exclude<ReturnOf<E[K]>, null | undefined> | D;
     emitCollect<K extends keyof E>(event: K, ...args: ArgsOf<E[K]>): Array<ReturnOf<E[K]>>;
@@ -75,6 +79,7 @@ declare class EventEmitter<H, E> implements IEventEmitter<H, E> {
     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;
     emit<K extends keyof E>(event: K, ...args: ArgsOf<E[K]>): H;
     emitFirst<K extends keyof E>(event: K, ...args: ArgsOf<E[K]>): any;
     emitFirstDefault<K extends keyof E, D>(event: K, generateDefault: () => D, ...args: ArgsOf<E[K]>): any;
@@ -89,7 +94,7 @@ declare class EventEmitter<H, E> implements IEventEmitter<H, E> {
     until(promise: Promise<any>): IUntilSubscriber<H, E>;
     hasHandlersForEvent(...events: Array<keyof E>): boolean;
     private copyFrom;
-    private handlersForEvent;
+    protected handlersForEvent<K extends keyof E>(event: K, ignoreClassSubscriptions?: true): (string | Handler<any, any>)[];
 }
 declare module EventEmitter {
     class Host<E> implements IEventEmitterHost<E> {

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

@@ -20,7 +20,7 @@ import { EquipType, RestCancelReason, SkillType } from "game/entity/IHuman";
 import type { IStat } from "game/entity/IStats";
 import { Stat } from "game/entity/IStats";
 import type { IMessageManager } from "game/entity/player/IMessageManager";
-import type { IMobCheck, IMovementIntent, IWalkPath } from "game/entity/player/IPlayer";
+import type { IMovementIntent, IWalkPath } from "game/entity/player/IPlayer";
 import { PlayerState, TurnTypeFlag, WeightStatus } from "game/entity/player/IPlayer";
 import type { INoteManager } from "game/entity/player/note/NoteManager";
 import PlayerDefense from "game/entity/player/PlayerDefense";
@@ -30,7 +30,7 @@ import type { StatChangeTimerFactory } from "game/entity/StatFactory";
 import { StatChangeCurrentTimerStrategy } from "game/entity/StatFactory";
 import { FireType } from "game/IGame";
 import type { Quality } from "game/IObject";
-import type { IMoveToIslandOptions, IslandId } from "game/island/IIsland";
+import type { IMobCheck, IMoveToIslandOptions, IslandId } from "game/island/IIsland";
 import type Island from "game/island/Island";
 import type { EquipEffectByType, EquipEffects, IContainer, IRanged, RecipeLevel } from "game/item/IItem";
 import { EquipEffect, ItemType, ItemTypeGroup } from "game/item/IItem";

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

@@ -10,10 +10,8 @@
  */
 import type { Events } from "event/EventEmitter";
 import type Doodad from "game/doodad/Doodad";
-import type Creature from "game/entity/creature/Creature";
 import type Human from "game/entity/Human";
 import type { HairColor, HairStyle, SkinColor } from "game/entity/IHuman";
-import type NPC from "game/entity/npc/NPC";
 import type { IMessage } from "game/entity/player/IMessageManager";
 import type MessageManager from "game/entity/player/MessageManager";
 import type { INote } from "game/entity/player/note/NoteManager";
@@ -21,7 +19,6 @@ import type Player from "game/entity/player/Player";
 import { ItemType } from "game/item/IItem";
 import type { Prompt } from "game/meta/prompt/IPrompt";
 import type { Milestone } from "game/milestones/IMilestone";
-import type Tile from "game/tile/Tile";
 import type InterruptChoice from "language/dictionary/InterruptChoice";
 import { Direction } from "utilities/math/Direction";
 import type { IVector2, IVector3 } from "utilities/math/IVector";
@@ -177,20 +174,6 @@ export interface IStatOld {
     regen: number;
     regenBase: number;
 }
-export interface IMobCheck extends IVector3 {
-    tile: Tile;
-    creature?: Creature;
-    player?: Human;
-    npc?: NPC;
-    obstacle?: boolean;
-    water?: boolean;
-    freshWater?: boolean;
-    shallowWater?: boolean;
-    swampWater?: boolean;
-    noTile?: boolean;
-    waterTiles?: number;
-    voidTiles?: number;
-}
 export declare const setupSpawnItems: ItemType[];
 export declare const setupWaterItems: ItemType[];
 export declare const setupToolItems: ItemType[];

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

@@ -10,7 +10,9 @@
  */
 import type { BiomeType } from "game/biome/IBiome";
 import type Doodad from "game/doodad/Doodad";
+import type Creature from "game/entity/creature/Creature";
 import type Human from "game/entity/Human";
+import type NPC from "game/entity/npc/NPC";
 import type { IIslandTemplate, TickFlag, TileUpdateType } from "game/IGame";
 import type { MultiplayerLoadingDescription } from "game/meta/Loading";
 import type { TerrainType } from "game/tile/ITerrain";
@@ -157,3 +159,17 @@ export interface IIslandPort {
     name: string | ISerializedTranslation;
     position: IVector3;
 }
+export interface IMobCheck extends IVector3 {
+    tile: Tile;
+    creature?: Creature;
+    player?: Human;
+    npc?: NPC;
+    obstacle?: boolean;
+    water?: boolean;
+    freshWater?: boolean;
+    shallowWater?: boolean;
+    swampWater?: boolean;
+    noTile?: boolean;
+    waterTiles?: number;
+    voidTiles?: number;
+}

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

@@ -25,7 +25,7 @@ import type { Game } from "game/Game";
 import type { IGameOld } from "game/IGame";
 import { TickFlag, TileUpdateType } from "game/IGame";
 import { Quality } from "game/IObject";
-import type { IIslandEvents, IIslandLoadOptions, IIslandPort, ISeeds, IslandId, IWaterContamination, IWaterFill, IWell } from "game/island/IIsland";
+import type { IIslandEvents, IIslandLoadOptions, IIslandPort, IMobCheck, ISeeds, IslandId, IWaterContamination, IWaterFill, IWell } from "game/island/IIsland";
 import { WaterType } from "game/island/IIsland";
 import type { ILiquidGather } from "game/item/IItem";
 import type { IRequirementInfo } from "game/item/IItemManager";
@@ -216,6 +216,7 @@ export default class Island extends EventEmitter.Host<IIslandEvents> implements
      */
     calculateTileLightLevel(tile: Tile): number;
     getLightSourceAt(x: number, y: number, z: number): number;
+    checkForTargetInRange(tile: Tile, direction: Direction.Cardinal, range: number, includePlayers?: boolean): IMobCheck;
     fireBreath(x: number, y: number, z: number, facingDirection: Direction, itemName?: Translation, player?: boolean): void;
     coolFires(requirements: IRequirementInfo, human: Human): void;
     /**

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

@@ -73,11 +73,16 @@ export interface IContainable {
     containerType?: ContainerType;
     [SYMBOL_CONTAINER_CACHED_REFERENCE]?: ContainerReference;
 }
-export interface IContainer extends IContainable {
-    containedItems: Item[];
+interface IBaseContainer extends IContainable {
     transientItems?: Item[];
     itemOrders?: number[];
 }
+export interface IContainer extends IBaseContainer {
+    containedItems: Item[];
+}
+export interface IMaybeContainer extends IBaseContainer {
+    containedItems?: Item[];
+}
 export interface IItemDisassembleResult {
     items: IItemDisassembly[];
     itemsBroken: number;

package/definitions/game/game/temperature/TemperatureManager.d.ts

@@ -33,7 +33,14 @@ import Vector2 from "utilities/math/Vector2";
 export declare const TEMPERATURE_BOUNDARY_MIN_VEC2: Vector2;
 export declare const TEMPERATURE_INVALID = 255;
 export interface ITemperatureManagerEvents {
+    /**
+     * Note: This event can only be listened for by subscribing directly to `temperatureManager.event`
+     */
     updateProducedTile(tile: Tile, invalidateRange?: number): any;
+    /**
+     * Note: This event can only be listened for by subscribing directly to `temperatureManager.event`
+     */
+    recalculate(x: number, y: number, z: number, type: TempType): any;
 }
 export default class TemperatureManager extends EventEmitter.Host<ITemperatureManagerEvents> implements IPreSerializeCallback {
     private readonly island;

package/definitions/game/game/tile/ITerrain.d.ts

@@ -16,7 +16,7 @@ import type { SkillType } from "game/entity/IHuman";
 import type { IDecayTemperatureRange } from "game/IGame";
 import type { Quality } from "game/IObject";
 import type { WaterType } from "game/island/IIsland";
-import type { IContainer, ItemType } from "game/item/IItem";
+import type { IContainer, IMaybeContainer, ItemType } from "game/item/IItem";
 import type Item from "game/item/Item";
 import type MagicalPropertyManager from "game/magic/MagicalPropertyManager";
 import type { MapTile } from "game/mapping/IMapTile";
@@ -146,6 +146,7 @@ export interface ITileOld {
     event?: TileEvent[];
 }
 export type ITileContainer = IContainer & IVector3;
+export type IMaybeTileContainer = IMaybeContainer & IVector3;
 export interface ITileData {
     type: TerrainType;
     minDur?: number;

package/definitions/game/game/tile/Tile.d.ts

@@ -18,9 +18,8 @@ import type { IMessageManager } from "game/entity/player/IMessageManager";
 import { FireType } from "game/IGame";
 import { Quality } from "game/IObject";
 import type { IslandId } from "game/island/IIsland";
-import type { IContainer } from "game/item/IItem";
 import type Item from "game/item/Item";
-import type { IOverlayInfo, ITerrainDescription, ITileContainer, ITileData } from "game/tile/ITerrain";
+import type { IMaybeTileContainer, IOverlayInfo, ITerrainDescription, ITileContainer, ITileData } from "game/tile/ITerrain";
 import { TerrainType } from "game/tile/ITerrain";
 import type TileEvent from "game/tile/TileEvent";
 import { WorldZ } from "game/WorldZ";
@@ -103,10 +102,19 @@ export default class Tile implements IVector4, Partial<ITileContainer>, IFieldOf
     set doodadAnimationDisabled(value: boolean);
     get variation(): number;
     get isMapEdge(): boolean;
+    /**
+     * Check if this Tile containers some items
+     */
+    get hasTileContainer(): boolean;
     /**
      * Gets/creates tile container
      */
-    get tileContainer(): IContainer;
+    get tileContainer(): ITileContainer;
+    /**
+     * Gets a tile container.
+     * It will not create one when called.
+     */
+    get maybeTileContainer(): IMaybeTileContainer;
     /**
      * Checks for:
      * Passable

package/definitions/game/game/tile/events/IFire.d.ts

@@ -11,10 +11,9 @@
 import type { ILootItem } from "game/ILoot";
 import type { Quality } from "game/IObject";
 import type Island from "game/island/Island";
-import type { IContainer } from "game/item/IItem";
 import { ItemType } from "game/item/IItem";
 import type Item from "game/item/Item";
-import type { ITileContainer } from "game/tile/ITerrain";
+import type Tile from "game/tile/Tile";
 import type TileEvent from "game/tile/TileEvent";
 export declare enum FireStage {
     Extinguished = 0,
@@ -33,7 +32,7 @@ export declare module FireStage {
     function getTemperature(stage: FireStage, min: number, max: number): number;
 }
 export declare module IFire {
-    function dissassemblyBurn(island: Island, item: Item, container: ITileContainer, disassembly: boolean): Item[];
-    function harvestGatherBurn(step: number, resources: ILootItem[] | undefined, container: IContainer, quality: Quality | undefined, tileEvent: TileEvent): void;
-    function burnsLike(burnsLikeItem: ItemType, tileEvent: TileEvent, tileContainer: IContainer, quality: Quality | undefined): Item[];
+    function dissassemblyBurn(island: Island, item: Item, tile: Tile, disassembly: boolean): Item[];
+    function harvestGatherBurn(step: number, resources: ILootItem[] | undefined, tile: Tile, quality: Quality | undefined, tileEvent: TileEvent): void;
+    function burnsLike(burnsLikeItem: ItemType, tileEvent: TileEvent, tile: Tile, quality: Quality | undefined): Item[];
 }

package/definitions/game/utilities/collection/map/PriorityMap.d.ts

@@ -12,7 +12,6 @@
  * Used for ordering a list of items by "priority". Higher priorities come before lower priorities.
  */
 export declare class PriorityMap<T> {
-    static orderMultiple2<T extends Iterable<any>>(lists: Array<PriorityMap<T>>): T[];
     static orderMultiple<T extends Iterable<any>>(lists: Array<PriorityMap<T>>): T[];
     private readonly priorities;
     private readonly map;
@@ -38,7 +37,7 @@ export declare class PriorityMap<T> {
      * Returns an iterator of the items in this list.
      */
     stream(direction?: PriorityListStreamDirection): import("@wayward/goodstream").default<T>;
-    array(): (T extends readonly (infer InnerArr)[] ? InnerArr : T)[];
+    array(direction?: PriorityListStreamDirection): T[];
     getInternalMap(): Record<number, T>;
 }
 export declare enum PriorityListStreamDirection {

package/package.json

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