@wayward/types 2.14.2-beta.dev.20241221.1 → 2.14.3-beta

package/definitions/game/IGlobal.d.ts

@@ -26,6 +26,7 @@ import type OldUi from "@wayward/game/ui/old/OldUi";
 import type Version from "@wayward/game/utilities/Version";
 import "@wayward/goodstream/apply";
 import "@wayward/hosts/shared/globalTypes";
+import type { IBuildId } from "@wayward/hosts/shared/globalTypes";
 import "@wayward/utilities/IGlobal";
 import "@wayward/utilities/prototype/Promise";
 import "@wayward/utilities/typesglobal/Class";
@@ -57,6 +58,8 @@ declare global {
     const gameVersionTitleMajor: string;
     const gameVersionTitleMinor: string;
     const gameVersionTitle: string;
+    let gameVersionDeployId: IBuildId | undefined;
+    let gameVersionBuildId: IBuildId | undefined;
     let webGlVersion: number;
     const VIEWPORT_MIN_WIDTH: number;
     const VIEWPORT_MIN_HEIGHT: number;

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

@@ -42,8 +42,10 @@ import type { Renderer } from "@wayward/game/renderer/Renderer";
 import type { WorldRenderer } from "@wayward/game/renderer/world/WorldRenderer";
 import type SaveManager from "@wayward/game/save/SaveManager";
 import type Steamworks from "@wayward/game/steamworks/Steamworks";
+import type { GlobalMouseInfo } from "@wayward/game/ui/input/InputManager";
 import type ScreenManager from "@wayward/game/ui/screen/ScreenManager";
 import type GameScreen from "@wayward/game/ui/screen/screens/GameScreen";
+import type ItemComponentEventBus from "@wayward/game/ui/screen/screens/game/component/item/ItemComponentEventBus";
 import type ActionBar from "@wayward/game/ui/screen/screens/game/static/ActionBar";
 import type HoveredTileTracker from "@wayward/game/ui/screen/screens/game/util/HoveredTileTracker";
 import type ActionMenuHandler from "@wayward/game/ui/screen/screens/game/util/movement/ActionMenuHandler";
@@ -92,11 +94,13 @@ export declare enum EventBus {
     UiActionMenuHandler = 37,
     UiGameScreen = 38,
     UiHoveredTileTracker = 39,
-    UiInteractionManager = 40,
-    UiMovementHandler = 41,
-    UiPathingHandler = 42,
-    UsableActions = 43,
-    WorldRenderer = 44
+    UiInputManagerMouse = 40,
+    UiInteractionManager = 41,
+    UiItemComponentStatic = 42,
+    UiMovementHandler = 43,
+    UiPathingHandler = 44,
+    UsableActions = 45,
+    WorldRenderer = 46
 }
 declare const eventBuses: {
     [EventBus.Actions](): ActionExecutor<any, any, any, any, any>;
@@ -139,7 +143,9 @@ declare const eventBuses: {
     [EventBus.UiActionMenuHandler](): ActionMenuHandler;
     [EventBus.UiGameScreen](): GameScreen;
     [EventBus.UiHoveredTileTracker](): HoveredTileTracker;
+    [EventBus.UiInputManagerMouse](): GlobalMouseInfo;
     [EventBus.UiInteractionManager](): InteractionManager;
+    [EventBus.UiItemComponentStatic](): ItemComponentEventBus;
     [EventBus.UiMovementHandler](): MovementHandler;
     [EventBus.UiPathingHandler](): PathingHandler;
     [EventBus.UsableActions](): UsableAction;
@@ -187,11 +193,13 @@ export declare const eventBusManager: EventBusManager<EventBus, {
     37(): ActionMenuHandler;
     38(): GameScreen;
     39(): HoveredTileTracker;
-    40(): InteractionManager;
-    41(): MovementHandler;
-    42(): PathingHandler;
-    43(): UsableAction;
-    44(): WorldRenderer;
+    40(): GlobalMouseInfo;
+    41(): InteractionManager;
+    42(): ItemComponentEventBus;
+    43(): MovementHandler;
+    44(): PathingHandler;
+    45(): UsableAction;
+    46(): WorldRenderer;
 }>;
 /**
  * For backwards compat / ease of use

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

@@ -56,11 +56,13 @@ export declare const eventManager: EventManager<EventBus, {
     37(): import("../ui/screen/screens/game/util/movement/ActionMenuHandler").default;
     38(): import("../ui/screen/screens/GameScreen").default;
     39(): import("../ui/screen/screens/game/util/HoveredTileTracker").default;
-    40(): import("../ui/screen/screens/game/util/movement/InteractionManager").default;
-    41(): import("../ui/screen/screens/game/util/movement/MovementHandler").default;
-    42(): import("../ui/screen/screens/game/util/movement/PathingHandler").default;
-    43(): import("../game/entity/action/usable/UsableAction").default;
-    44(): import("../renderer/world/WorldRenderer").WorldRenderer;
+    40(): import("../ui/input/InputManager").GlobalMouseInfo;
+    41(): import("../ui/screen/screens/game/util/movement/InteractionManager").default;
+    42(): import("../ui/screen/screens/game/component/item/ItemComponentEventBus").default;
+    43(): import("../ui/screen/screens/game/util/movement/MovementHandler").default;
+    44(): import("../ui/screen/screens/game/util/movement/PathingHandler").default;
+    45(): import("../game/entity/action/usable/UsableAction").default;
+    46(): import("../renderer/world/WorldRenderer").WorldRenderer;
 }>;
 /**
  * EventHandler that is typed with the games event buses

package/definitions/game/game/Game.d.ts

@@ -51,6 +51,7 @@ import type { IVector2 } from "@wayward/game/utilities/math/IVector";
 import { WebWorkerManager } from "@wayward/game/webWorker/WebWorkerManager";
 import EventEmitter from "@wayward/utilities/event/EventEmitter";
 import type { Random } from "@wayward/utilities/random/Random";
+import type { IBuildId } from "@wayward/hosts/shared/globalTypes";
 export declare class Game extends EventEmitter.Host<IGameEvents> {
     get isChallenge(): boolean;
     private difficultyOptions;
@@ -72,6 +73,7 @@ export declare class Game extends EventEmitter.Host<IGameEvents> {
     version: Version.String;
     lastSaveVersion?: Version.String;
     lastSaveBuildTime?: number;
+    lastSaveBuildId?: IBuildId;
     readonly interval = 16.6666;
     readonly autoSave: AutoSave;
     readonly commandManager: CommandManager;

package/definitions/game/game/IGame.d.ts

@@ -217,7 +217,8 @@ export declare enum SaveType {
     Quit = 2,
     BackToMainMenu = 3,
     Multiplayer = 4,
-    ReplayConvert = 5
+    ReplayConvert = 5,
+    AutoSave = 6
 }
 export declare enum TileUpdateType {
     Batch = 0,

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

@@ -133,6 +133,7 @@ export default class Doodad extends EntityMovable<IDoodadDescription, DoodadType
     private _isWell?;
     private readonly _doodadGroupCache;
     constructor(entityOptions?: IEntityConstructorOptions<DoodadType>, options?: IDoodadOptions);
+    protected get typeEnum(): typeof DoodadType;
     get asCorpse(): undefined;
     get asCreature(): undefined;
     get asDoodad(): Doodad | undefined;

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

@@ -27,13 +27,14 @@ import type { IslandId } from "@wayward/game/game/island/IIsland";
 import type Island from "@wayward/game/game/island/Island";
 import type { IUncastableContainer } from "@wayward/game/game/item/IItem";
 import type Item from "@wayward/game/game/item/Item";
-import type { EntityReferenceTypes, IReferenceable, Reference } from "@wayward/game/game/reference/IReferenceManager";
+import { type EntityReferenceTypes, type IReferenceable, type Reference } from "@wayward/game/game/reference/IReferenceManager";
 import type { ITemperatureSource } from "@wayward/game/game/temperature/ITemperature";
 import type Tile from "@wayward/game/game/tile/Tile";
 import type TileEvent from "@wayward/game/game/tile/TileEvent";
-import type { ISerializedTranslation } from "@wayward/game/language/ITranslation";
+import { type ISerializedTranslation } from "@wayward/game/language/ITranslation";
 import type Translation from "@wayward/game/language/Translation";
 import type { RenderSource, UpdateRenderFlag } from "@wayward/game/renderer/IRenderer";
+import type { Renderer } from "@wayward/game/renderer/Renderer";
 import type { INotificationLocation, ItemNotifierType, MarkerIconType, StatNotificationType } from "@wayward/game/renderer/notifier/INotifier";
 import type { IVector3 } from "@wayward/game/utilities/math/IVector";
 import type { IVector4 } from "@wayward/game/utilities/math/Vector4";
@@ -44,23 +45,18 @@ export default abstract class Entity<DescriptionType = unknown, TypeType extends
     abstract readonly tileUpdateType: TileUpdateType;
     id: number;
     type: TypeType;
+    historicalActions?: PartialRecord<ActionType, number>;
     referenceId?: number;
     renamed?: string | ISerializedTranslation;
     x: number;
     y: number;
     z: WorldZ;
     private _data?;
+    private _persistentMarker?;
+    private _persistentMarkerHidden?;
     private _tags?;
-    historicalActions?: PartialRecord<ActionType, number>;
     islandId: IslandId;
     preventRendering?: boolean;
-    /**
-     * Notifier marker assigned to this entity
-     */
-    persistentMarker: {
-        type: MarkerIconType;
-        guid: string;
-    } | undefined;
     private _humansWithinBound?;
     /**
      * Cached tile the entity is on.
@@ -75,11 +71,14 @@ export default abstract class Entity<DescriptionType = unknown, TypeType extends
      * Get the entities description
      */
     get description(): Readonly<DescriptionType> | undefined;
+    protected abstract get typeEnum(): PartialRecord<string | TypeType, TypeType | string>;
     /**
      * Adds a referenceId to the entity if it doesn't already have one
      */
     addReferenceId(): void;
     abstract getName(): Translation;
+    /** @deprecated Console helper */
+    protected get debug(): any;
     /**
      * Called when filling out the entities description for the first time
      */
@@ -118,6 +117,12 @@ export default abstract class Entity<DescriptionType = unknown, TypeType extends
     updateView(source: RenderSource, updateFov?: boolean | UpdateRenderFlag.FieldOfView | UpdateRenderFlag.FieldOfViewSkipTransition): void;
     notifyItem(itemNotifierType: ItemNotifierType, item: Item): void;
     notifyStat(type: StatNotificationType, value: number): void;
+    /**
+     * This is called clientside the first time the renderer seens the entity
+     */
+    onFirstRender(renderer: Renderer): void;
+    getCurrentMarkerIconType(): MarkerIconType | undefined;
+    setMarkerIconHidden(hidden: boolean): void;
     addMarkerIcon(type: MarkerIconType): void;
     removeMarkerIcon(...types: MarkerIconType[]): void;
     getProducedTemperature(): number | undefined;

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

@@ -14,6 +14,7 @@ import type { IEntityConstructorOptions, IStatus, StatusChangeReason } from "@wa
 import { type IStatEvents, type IStats } from "@wayward/game/game/entity/IStats";
 import type { IStatHost } from "@wayward/game/game/entity/Stats";
 import Stats from "@wayward/game/game/entity/Stats";
+import type { StatusApplicability } from "@wayward/game/game/entity/status/IStatus";
 import { StatusType } from "@wayward/game/game/entity/status/IStatus";
 import Status from "@wayward/game/game/entity/status/Status";
 import type { EntityReferenceTypes } from "@wayward/game/game/reference/IReferenceManager";
@@ -40,7 +41,7 @@ export default abstract class EntityWithStats<DescriptionType = unknown, TypeTyp
     readonly stat: Stats<this>;
     private readonly statusHandlers;
     constructor(entityOptions?: IEntityConstructorOptions<TypeType>);
-    protected getApplicableStatuses(): Set<StatusType> | undefined;
+    protected getStatusApplicability(): StatusApplicability | undefined;
     get asEntityWithStats(): EntityWithStats<DescriptionType, TypeType, EntityReferenceType, TagType>;
     /**
      * Returns whether the entity has the given `StatusType`

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

@@ -25,7 +25,8 @@ import type Item from "@wayward/game/game/item/Item";
 import type Tile from "@wayward/game/game/tile/Tile";
 import type TileEvent from "@wayward/game/game/tile/TileEvent";
 import type { Direction } from "@wayward/game/utilities/math/Direction";
-export interface IEntityEvents {
+import type { IEventSubscriberEvents } from "@wayward/utilities/event/EventEmitter";
+export interface IEntityEvents extends IEventSubscriberEvents {
     /**
      * Called when an entity is killed by another entity.
      */

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

@@ -152,7 +152,7 @@ export declare const actionDescriptionsSlow: {
     }, [import("../../item/Item").default]>;
     134: import("./Action").Action<[import("@wayward/game/game/entity/action/IAction").ActionArgument.Container, import("./argument/ActionArgumentEnum").default<import("../../item/IItem").ItemType, "Bow" | "None" | "String" | "HideGlue" | "AnimalSkull" | "GraniteArrow" | "GraniteArrowhead" | "PileOfAsh" | "BarkLeggings" | "BarkShield" | "BarkTunic" | "Bone" | "Branch" | "CactusSpines" | "Charcoal" | "GraniteFlooring" | "CookedMeat" | "Earthworm" | "Feather" | "Fertilizer" | "WaterskinOfSeawater" | "FirePlough" | "BeggartickSeeds" | "Fossil" | "GoldCoins" | "GoldenChalice" | "GoldenRing" | "GoldShortSword" | "GrassSeeds" | "IronOre" | "WoodenDowels" | "Granite" | "LeafBedroll" | "Hide" | "Leaves" | "Limestone" | "Log" | "GraniteMortarAndPestle" | "ButtonMushrooms" | "Nopal" | "Peat" | "Sandstone" | "PileOfGravel" | "PileOfBeachSand" | "WoodenArrow" | "GraniteAxe" | "Bandage" | "WovenFabric" | "CactusNeedle" | "GraniteShovel" | "WoodenSpear" | "Suture" | "Raft" | "RawMeat" | "Raspberries" | "FlyAmanita" | "Rope" | "MapleSeeds" | "Badderlocks" | "SharpGlass" | "SharpGranite" | "Skullcap" | "SmoothGranite" | "Soil" | "GraniteSpear" | "Stones" | "GraniteWall" | "StrippedBark" | "Leather" | "Tannin" | "MilkThistleSeeds" | "TreeBark" | "HoneyFungus" | "ClematisVine" | "Twigs" | "Waterskin" | "WoodenPole" | "PeatBandage" | "BowDrill" | "FishingNet" | "RawCod" | "CookedCod" | "GraniteCampfire" | "VineWhip" | "PileOfSnow" | "BarkTorch" | "LitBarkTorch" | "HandDrill" | "SmallBag" | "Shale" | "SharpenedBone" | "Grindstone" | "RawFishSteak" | "CookedFishSteak" | "WaterskinOfDesalinatedWater" | "BoatPaddle" | "BullBoat" | "RefinedSand" | "Spyglass" | "Retort" | "RawClay" | "RawClayBlowpipe" | "ClayBlowpipe" | "LeatherBelt" | "LeatherTunic" | "LeatherBoots" | "LeatherCap" | "LeatherGorget" | "LeatherPants" | "LeatherGloves" | "GraniteFurnace" | "SandstoneKiln" | "IronTongs" | "Talc" | "TalcumPowder" | "WoodenSandCastFlask" | "Lens" | "PlantRoots" | "Lockpick" | "BoneNeedle" | "Pineapple" | "TatteredMap" | "Coal" | "SmeltedWroughtIron" | "LimestonePowder" | "SmeltedIron" | "Backpack" | "RottenMeat" | "GraniteHammer" | "RawChicken" | "CookedChicken" | "GraniteAnvil" | "WoodenChest" | "IronShortSword" | "IronBreastplate" | "IronBoots" | "IronHelmet" | "IronGorget" | "IronCuisses" | "IronGauntlets" | "IronHeater" | "SandstoneWall" | "SandstoneFlooring" | "SpiderSilk" | "AnimalFat" | "TallowTorch" | "ClayFlakes" | "GreenSand" | "OldInstructionalScroll" | "SlimeGelatin" | "SlimeGlue" | "CookedSpiderMeat" | "SpiderMeat" | "IronLockpick" | "RottingVegetation" | "Chives" | "IronHammer" | "IronSpear" | "IronShovel" | "IronDoubleAxe" | "IronPickaxe" | "Inkstick" | "Coconut" | "PalmLeaf" | "Offal" | "BoneFragments" | "LitPoleTorch" | "CottonBoll" | "CottonSeeds" | "CottonFabric" | "BonePole" | "Tourniquet" | "WroughtIronPickaxe" | "WroughtIronDoubleAxe" | "WroughtIronShovel" | "WroughtIronSpear" | "WroughtIronHammer" | "WroughtIronLockpick" | "WroughtIronShield" | "WroughtIronGauntlets" | "WroughtIronCuisses" | "WroughtIronGorget" | "WroughtIronHelmet" | "WroughtIronBoots" | "WroughtIronBreastplate" | "WroughtIronShortSword" | "WoodenWall" | "WoodenFlooring" | "WoodenDoor" | "FishingRod" | "MessageInABottle" | "CarbonPowder" | "PileOfCompost" | "FishGlue" | "WoodenShavings" | "GraniteDeadfall" | "Snare" | "WaterskinOfMedicinalWater" | "CharcoalBandage" | "WoodenTongs" | "WroughtIronTongs" | "SheetOfGlass" | "SolarStill" | "TinWaterStill" | "GraniteSundial" | "LitTallowTorch" | "Sinew" | "ShortBow" | "LongBow" | "CompositeBow" | "WaterskinOfPurifiedFreshWater" | "WaterskinOfUnpurifiedFreshWater" | "GlassBottle" | "Cork" | "GlassBottleOfSeawater" | "GlassBottleOfDesalinatedWater" | "GlassBottleOfMedicinalWater" | "GlassBottleOfPurifiedFreshWater" | "GlassBottleOfUnpurifiedFreshWater" | "WroughtIronArrow" | "IronArrow" | "GraniteBullet" | "WroughtIronBullet" | "IronBullet" | "LeatherQuiver" | "Ectoplasm" | "MagicalEssence" | "WoodenFence" | "CreatureIdol" | "CordedSling" | "LeatherSling" | "WroughtIronArrowhead" | "IronArrowhead" | "Hammock" | "CottonBedroll" | "FeatherBedroll" | "RawTaintedMeat" | "CookedTaintedMeat" | "GraniteKnife" | "RawBlindfish" | "CookedBlindfish" | "Pemmican" | "CookedPemmican" | "Sail" | "Sailboat" | "ChickenEgg" | "BoiledChickenEgg" | "SheafOfHay" | "Niter" | "Saltpeter" | "BlackPowder" | "FlintlockPistol" | "Giblets" | "ExplosiveTrap" | "SkeletalMageWand" | "RawClayJug" | "ClayJug" | "ClayJugOfSeawater" | "ClayJugOfDesalinatedWater" | "ClayJugOfMedicinalWater" | "ClayJugOfPurifiedFreshWater" | "ClayJugOfUnpurifiedFreshWater" | "RawClayBrick" | "ClayBrick" | "ClayWall" | "ClayFlooring" | "PineappleSeeds" | "RaspberrySeeds" | "PricklyPearSeeds" | "ClematisSeeds" | "PaperSheet" | "PaperMold" | "Beggarticks" | "MilkThistleFlowers" | "DrawnMap" | "TatteredClothShirt" | "TatteredClothTrousers" | "WoodenGate" | "PoisonIvyLeaves" | "PoisonIvySeeds" | "WroughtIronChest" | "IronChest" | "SwitchgrassSeeds" | "Apple" | "SpiderEggs" | "TailFeathers" | "AppleSeeds" | "VenomGland" | "OrnateWoodenChest" | "RollOfRedCarpet" | "OrnateCape" | "FireBladder" | "GoldenKey" | "WoodenShortSword" | "ClayKiln" | "ClayCampfire" | "ClayFurnace" | "CopperWaterStill" | "SandstoneCampfire" | "SandstoneFurnace" | "WroughtIronWaterStill" | "GraniteKiln" | "WroughtIronAnvil" | "IronAnvil" | "MageRobe" | "CrackedOrb" | "AnimalClaw" | "AnimalPelt" | "AnimalFur" | "Scales" | "SharkFin" | "RawReptileMeat" | "CookedReptileMeat" | "Tentacles" | "CookedTentacles" | "WormMeat" | "CookedWormMeat" | "GranitePickaxe" | "WroughtIronAxe" | "IronAxe" | "FertileSoil" | "GraniteHoe" | "WroughtIronHoe" | "IronHoe" | "LavaBeetleHelmet" | "SpruceCone" | "SpruceSeeds" | "SpruceNeedles" | "CypressCone" | "CypressSeeds" | "CypressLeaves" | "Lettuce" | "LettuceSeeds" | "ChiveSeeds" | "Potato" | "PotatoSeeds" | "Carrot" | "CarrotSeeds" | "CornEar" | "CornSeeds" | "Cucumber" | "CucumberSeeds" | "Tomato" | "TomatoSeeds" | "Pumpkin" | "PumpkinSeeds" | "PricklyPearFruit" | "SugarCaneStalks" | "SugarCaneSeeds" | "BushelOfWheat" | "Wheat" | "CookedPotato" | "CookedCornCob" | "BundleOfSwitchgrass" | "Cloak" | "WoodenMortarAndPestle" | "SandstoneMortarAndPestle" | "WroughtIronMortarAndPestle" | "IronMortarAndPestle" | "RawClayMortarAndPestle" | "ClayMortarAndPestle" | "CopperOre" | "SmeltedCopper" | "CopperPickaxe" | "CopperDoubleAxe" | "CopperShovel" | "CopperSpear" | "CopperHammer" | "CopperLockpick" | "CopperBuckler" | "CopperGauntlets" | "CopperGreaves" | "CopperGorget" | "CopperHelmet" | "CopperBoots" | "CopperCuirass" | "CopperShortSword" | "CopperTongs" | "CopperArrow" | "CopperBullet" | "CopperArrowhead" | "CopperChest" | "CopperAnvil" | "CopperAxe" | "CopperHoe" | "CopperMortarAndPestle" | "WaterskinOfGoatMilk" | "ClayJugOfGoatMilk" | "GlassBottleOfGoatMilk" | "Obsidian" | "OrnateBlueBook" | "Journal" | "MossCoveredBook" | "GildedRedBook" | "ArrowShaft" | "SlitherSucker" | "AberrantSlitherSucker" | "StrawHat" | "BlackplateSabatons" | "BlackplateBreastplate" | "BlackplateGauntlets" | "BlackplateGorget" | "BlackplateGreaves" | "BlackplateHelmet" | "DeathKnightAxe" | "Macuahuitl" | "ObsidianArrow" | "ObsidianArrowhead" | "ObsidianAxe" | "ObsidianKnife" | "ObsidianShovel" | "ObsidianSpear" | "TumbleweedSeeds" | "CoconutHusk" | "PeeledCoconut" | "CoconutMeat" | "CoconutContainerOfCoconutWater" | "CoconutContainer" | "CoconutContainerOfSeawater" | "CoconutContainerOfDesalinatedWater" | "CoconutContainerOfMedicinalWater" | "CoconutContainerOfPurifiedFreshWater" | "CoconutContainerOfUnpurifiedFreshWater" | "CoconutContainerOfGoatMilk" | "OldEducationalScroll" | "StrippedHide" | "ClaySandCastFlask" | "SandstoneSandCastFlask" | "GraniteSandCastFlask" | "BoneGlue" | "CutHide" | "BoneMeal" | "PileOfDesertSand" | "JoshuaTreeLeaves" | "JoshuaTreeFruit" | "JoshuaTreeSeeds" | "CookedJoshuaTreeFruit" | "JoshuaTreeFlowers" | "SaguaroCactusFruit" | "SaguaroCactusSeeds" | "SaguaroCactusChunk" | "GraniteWell" | "SandstoneWell" | "ClayWell" | "AloeVeraLeaves" | "AloeVeraSeeds" | "DeadScorpion" | "DeadAberrantScorpion" | "CookedScorpion" | "CookedAberrantScorpion" | "ScorpionStinger" | "CopperBakingTray" | "WroughtIronBakingTray" | "IronBakingTray" | "Flour" | "Dough" | "Hardtack" | "HitchingPost" | "ShreddedPaper" | "RawMudskipper" | "RawAberrantMudskipper" | "CookedMudskipper" | "CookedAberrantMudskipper" | "RawRedSnapper" | "CookedRedSnapper" | "RawWalleye" | "CookedWalleye" | "WoodenShield" | "CopperRefinementTools" | "WroughtIronRefinementTools" | "IronRefinementTools" | "ScaleBelt" | "ScaleVest" | "ScaleBoots" | "ScaleCap" | "ScaleBevor" | "ScaleLeggings" | "ScaleGloves" | "CookedJoshuaTreeFlowers" | "SaguaroCactusRibs" | "BladesOfGrass" | "AnimalDroppings" | "AnimalDung" | "Guano" | "Tallow" | "TallowCandle" | "LitTallowCandle" | "WispDust" | "MagicalAspect" | "GoldenSextant" | "RawChoppedFish" | "CookedChoppedFish" | "CookedFishKebab" | "AshCement" | "AshCementBrick" | "AshCementFlooring" | "AshCementWall" | "IceShard" | "PenguinEgg" | "BoiledPenguinEgg" | "RawPenguinMeat" | "CookedPenguinMeat" | "Crowberries" | "CookedCrowberries" | "CrowberrySeeds" | "Winterberries" | "WinterberrySeeds" | "ArcticPoppies" | "ArcticPoppySeeds" | "PirateHat" | "AloeVeraBandage" | "SharkTooth" | "CopperKnife" | "WroughtIronKnife" | "IronKnife" | "TinOre" | "SmeltedTin" | "TinPickaxe" | "TinDoubleAxe" | "TinShovel" | "TinSpear" | "TinHammer" | "TinLockpick" | "TinShield" | "TinGloves" | "TinChausses" | "TinBevor" | "TinHelmet" | "TinFootgear" | "TinCuirass" | "TinShortSword" | "TinTongs" | "TinArrow" | "TinBullet" | "TinArrowhead" | "TinChest" | "TinAnvil" | "TinAxe" | "TinHoe" | "TinMortarAndPestle" | "TinBakingTray" | "TinRefinementTools" | "TinKnife" | "SmeltedBronze" | "BronzePickaxe" | "BronzeDoubleAxe" | "BronzeShovel" | "BronzeSpear" | "BronzeHammer" | "BronzeLockpick" | "BronzeKiteShield" | "BronzeGauntlets" | "BronzeGreaves" | "BronzeBevor" | "BronzeHelmet" | "BronzeBoots" | "BronzeChestArmor" | "BronzeShortSword" | "BronzeTongs" | "BronzeArrow" | "BronzeBullet" | "BronzeArrowhead" | "BronzeChest" | "BronzeAnvil" | "BronzeAxe" | "BronzeHoe" | "BronzeMortarAndPestle" | "BronzeBakingTray" | "BronzeRefinementTools" | "BronzeKnife" | "IceBrick" | "SnowBrick" | "IceWall" | "IceFlooring" | "SnowWall" | "SnowFlooring" | "CaliginousScrap" | "MagicalExtract" | "ShimmeringFibers" | "MagicalTwine" | "SandstoneHammer" | "SandstoneBullet" | "SandstoneAnvil" | "SnowScarecrow" | "FrozenFlesh" | "AnimalTusk" | "WhitePineCone" | "WhitePineSeeds" | "WhitePineNeedles" | "FurCoat" | "FurMittens" | "FurBoots" | "BirdDroppings" | "HardenedCoil" | "MagicalBinding" | "ArmoredScales" | "RawPangolinMeat" | "CookedPangolinMeat" | "ArmoredScaleBelt" | "ArmoredScaleVest" | "ArmoredScaleBoots" | "ArmoredScaleCrown" | "ArmoredScaleBevor" | "ArmoredScaleCuisses" | "ArmoredScaleGloves" | "TinNeedle" | "CopperNeedle" | "WroughtIronNeedle" | "IronNeedle" | "BronzeNeedle" | "TuftsOfTanglehead" | "TangleheadSeeds" | "WispInAGlassBottle" | "AberrantWispInAGlassBottle" | "WispInAClayJug" | "AberrantWispInAClayJug" | "WispInACoconutContainer" | "AberrantWispInACoconutContainer" | "WispInAWaterskin" | "AberrantWispInAWaterskin" | "StrawScarecrow" | "CactusScarecrow" | "ClothShirt" | "ClothTrousers" | "UnripePapaya" | "Papaya" | "PapayaSeeds" | "PalapalaiFrond" | "PalapalaiSpores" | "ButtonMushroomSpores" | "FlyAmanitaSpores" | "BrambleCrown" | "DarkBrambleCrown" | "Cotton" | "WaterskinOfSwampWater" | "GlassBottleOfSwampWater" | "ClayJugOfSwampWater" | "CoconutContainerOfSwampWater" | "WaterskinOfFilteredWater" | "GlassBottleOfFilteredWater" | "ClayJugOfFilteredWater" | "CoconutContainerOfFilteredWater" | "ClayFilter" | "SandstoneAxe" | "SandstoneShovel" | "SharpSandstone" | "SmoothSandstone" | "SandstoneSpear" | "SandstoneKnife" | "SandstonePickaxe" | "SandstoneHoe" | "SandstoneDeadfall" | "SandstoneSundial" | "WoodenPlank" | "WoodenWheel" | "WoodenAxle" | "WoodenMinecart" | "WoodenRail" | "WoodenTrack" | "TinWheel" | "TinAxle" | "TinMinecart" | "TinRail" | "TinTrack" | "CopperWheel" | "CopperAxle" | "CopperMinecart" | "CopperRail" | "CopperTrack" | "WroughtIronWheel" | "WroughtIronAxle" | "WroughtIronMinecart" | "WroughtIronRail" | "WroughtIronTrack" | "IronWheel" | "IronAxle" | "IronMinecart" | "IronRail" | "IronTrack" | "BronzeWheel" | "BronzeAxle" | "BronzeMinecart" | "BronzeRail" | "BronzeTrack" | "BasaltArrow" | "BasaltArrowhead" | "Basalt" | "BasaltMortarAndPestle" | "BasaltAxe" | "BasaltShovel" | "SharpBasalt" | "SmoothBasalt" | "BasaltSpear" | "BasaltFlooring" | "BasaltWall" | "BasaltCampfire" | "BasaltFurnace" | "BasaltHammer" | "BasaltAnvil" | "BasaltDeadfall" | "IronWaterStill" | "BasaltSundial" | "BasaltBullet" | "BasaltKnife" | "BasaltKiln" | "BasaltPickaxe" | "BasaltHoe" | "BasaltSandCastFlask" | "BasaltWell" | "WoodenTrackGate" | "MoldyScroll" | "MysteriousParchment" | "MagicalInscription" | "CattailLeaves" | "CattailShoots" | "CattailFlowers" | "CattailSeeds" | "CobblestoneFlooring" | "WaterLilies" | "Mud" | "SpikerushSheaths" | "SpikerushSeeds" | "WoodenBookcase" | "GraniteLighthouse" | "SandstoneLighthouse" | "ClayLighthouse" | "BasaltLighthouse" | "WoodenCage" | "FullWoodenCage" | "TinCage" | "FullTinCage" | "CopperCage" | "FullCopperCage" | "WroughtIronCage" | "FullWroughtIronCage" | "IronCage" | "FullIronCage" | "BronzeCage" | "FullBronzeCage" | "Amber" | "Tourmaline" | "Topaz" | "Opal" | "Sapphire" | "WoodGolemFigure" | "ClayGolemFigure" | "GraniteGolemFigure" | "SandstoneGolemFigure" | "BasaltGolemFigure" | "AberrantWoodGolemFigure" | "AberrantClayGolemFigure" | "AberrantGraniteGolemFigure" | "AberrantSandstoneGolemFigure" | "AberrantBasaltGolemFigure" | "GraniteDripstone" | "SandstoneDripstone" | "BasaltDripstone" | "ClayDripstone" | "BronzeWaterStill" | "ArmorStand" | "RuneOfEvil" | "RuneOfChaos" | "RuneOfGood" | "GraniteAltar" | "WoodenWheelbarrow" | "TinWheelbarrow" | "CopperWheelbarrow" | "WroughtIronWheelbarrow" | "IronWheelbarrow" | "BronzeWheelbarrow" | "GraniteCrucible" | "SandstoneCrucible" | "BasaltCrucible" | "RawClayCrucible" | "ClayCrucible" | "SandstoneAltar" | "BasaltAltar" | "ClayAltar" | "PineResin" | "SpruceResin" | "CypressResin" | "Pitch" | "PitchGlue" | "MagicalOrb" | "RawAberrantCod" | "CookedAberrantCod" | "RawAberrantBlindfish" | "CookedAberrantBlindfish" | "RawAberrantRedSnapper" | "CookedAberrantRedSnapper" | "RawAberrantWalleye" | "CookedAberrantWalleye" | "FishBones" | "AnimalCartilage" | "GelatinPowder" | "Gelatin" | "Aspic" | "FruitCocktail" | "VegetableTerrine" | "TatteredClothBandana" | "ClothBandana" | "RustedScimitar" | "TricorneHat" | "SandstoneArrowhead" | "SandstoneArrow" | "ReedFlute" | "WoodenFlute" | "RawClayFlute" | "ClayFlute" | "BoneFlute" | "TinFlute" | "CopperFlute" | "WroughtIronFlute" | "IronFlute" | "BronzeFlute" | "StrippedLeather" | "ChickenEggshells" | "PenguinEggshells" | "Last">, [arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.Integer32]], import("../player/Player").default, void, import("@wayward/game/game/entity/action/IAction").IActionUsable, [import("../../item/IItem").IContainer, import("../../item/IItem").ItemType, (number | undefined)?]>;
     4: import("./Action").Action<[import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemInventory, [arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemInventory], [arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemNearby], [arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemNearby], [arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemNearby]], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, void, import("@wayward/game/game/entity/action/actions/StartFire").IStartFireCanUse, [import("../../item/Item").default, (import("../../item/Item").default | undefined)?, (import("../../item/Item").default | undefined)?, (import("../../item/Item").default | undefined)?, (import("../../item/Item").default | undefined)?]>;
-    23: import("./Action").Action<[import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, void, import("@wayward/game/game/entity/action/actions/StokeFire").IStokeFireCanUse, [import("../../item/Item").default]>;
+    23: import("./Action").Action<[import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, void, import("@wayward/game/game/entity/action/actions/StokeFire").IStokeFireCanUse, [import("../../item/Item").default]>;
     121: import("./Action").Action<[import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, void, import("@wayward/game/game/entity/action/actions/Summon").ISummonAction, [import("../../item/Item").default]>;
     128: import("./Action").Action<[[arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.Doodad]], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, boolean, import("@wayward/game/game/entity/action/actions/SwapWithArmorStand").ISwapEquipment, [(import("../../doodad/Doodad").default | undefined)?]>;
     131: import("./Action").Action<[[arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.Doodad]], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, boolean, import("@wayward/game/game/entity/action/actions/SwapWithArmorStand").ISwapEquipment, [(import("../../doodad/Doodad").default | undefined)?]>;

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

@@ -21,5 +21,5 @@ export interface IStokeFireCanUse extends IActionUsable {
     doodad?: Doodad;
     tileEvent?: TileEvent;
 }
-declare const _default: Action<[ActionArgument.ItemInventory], import("../../Human").default<unknown, number, import("../../../reference/IReferenceManager").ReferenceType.NPC | import("../../../reference/IReferenceManager").ReferenceType.Player>, void, IStokeFireCanUse, [Item]>;
+declare const _default: Action<[ActionArgument.ItemNearby], import("../../Human").default<unknown, number, import("../../../reference/IReferenceManager").ReferenceType.NPC | import("../../../reference/IReferenceManager").ReferenceType.Player>, void, IStokeFireCanUse, [Item]>;
 export default _default;

package/definitions/game/game/entity/action/actions/moveItem/MoveItemFilterArgument.d.ts

@@ -20,7 +20,10 @@ export interface IMoveItemFilterArgument {
     moveLimit?: number;
     quality?: ArrayOr<Quality>;
     text?: string;
+    /** Excludes items that are both protected themselves, and that are in a protected container */
     excludeProtected?: boolean;
+    /** Combined with `excludeProtected` to re-include items that are just in a protected container */
+    includeInProtectedContainer?: boolean;
     excludeEquipped?: boolean;
 }
 export declare class MoveItemFilterArgument<FILTER extends IMoveItemFilterArgument> extends ActionArgumentCustom<FILTER> {

package/definitions/game/game/entity/action/usable/IUsableAction.d.ts

@@ -35,7 +35,7 @@ import type Message from "@wayward/game/language/dictionary/Message";
 import { TranslationArg } from "@wayward/game/language/ITranslation";
 import type Translation from "@wayward/game/language/Translation";
 import type Bindable from "@wayward/game/ui/input/Bindable";
-import type { ItemDetailIconLocation } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import type { ItemDetailIconLocation } from "@wayward/game/ui/screen/screens/game/component/item/IItemComponent";
 import type Tooltip from "@wayward/game/ui/tooltip/Tooltip";
 import type { HighlightSelector } from "@wayward/game/ui/util/IHighlight";
 import type HashSet from "@wayward/utilities/collection/set/HashSet";
@@ -57,6 +57,7 @@ export interface IUsableActionItemRequirement extends Omit<IUsableActionRequirem
     finder?: false | ((player: Player, defaultOptions?: IItemFinderOptions, provided?: Omit<IUsableActionPossibleUsing, "item">) => ItemFinder | undefined);
     requiresQuality?: true;
     requiresType?: true;
+    cannotDamageItem?: true;
 }
 export declare namespace IUsableActionItemRequirement {
     function hasFinder(requirements?: IUsableActionRequirements): boolean;
@@ -107,6 +108,8 @@ export interface IUsableActionUsing<REQUIREMENTS extends IUsableActionRequiremen
     targetTile: Tile;
     fromTile: Tile;
     item: ((REQUIREMENTS["item"] extends true ? Item : never) | (undefined extends REQUIREMENTS["item"] ? undefined : never) | (REQUIREMENTS["item"] extends {
+        cannotDamageItem: true;
+    } ? Item : never) | (REQUIREMENTS["item"] extends {
         allowNone: true;
     } ? Item | undefined : never) | (REQUIREMENTS["item"] extends {
         validate(player: Player, value: Item): boolean;
@@ -117,7 +120,9 @@ export interface IUsableActionUsing<REQUIREMENTS extends IUsableActionRequiremen
     } ? Item : never) | (REQUIREMENTS["item"] extends {
         allowOnlyItemType(player: Player, type: ItemType): boolean;
     } ? undefined : never));
-    itemType: ((REQUIREMENTS["item"] extends true ? ItemType : never) | (undefined extends REQUIREMENTS["item"] ? undefined : never) | (REQUIREMENTS["item"] extends {
+    itemType: ((REQUIREMENTS["item"] extends true ? ItemType : never) | (REQUIREMENTS["item"] extends {
+        cannotDamageItem: true;
+    } ? ItemType : never) | (undefined extends REQUIREMENTS["item"] ? undefined : never) | (REQUIREMENTS["item"] extends {
         allowOnlyItemType(player: Player, type: ItemType): boolean;
     } ? ItemType : never) | (REQUIREMENTS["item"] extends {
         requiresType: true;
@@ -132,6 +137,17 @@ export interface IUsableActionUsing<REQUIREMENTS extends IUsableActionRequiremen
     } ? REQUIREMENTS["item"] extends {
         requiresType: true;
     } ? never : undefined : never));
+    container?: ((REQUIREMENTS["item"] extends true ? IContainer : never) | (REQUIREMENTS["item"] extends {
+        allowOnlyItemType(player: Player, type: ItemType): boolean;
+    } ? IContainer : never) | (REQUIREMENTS["item"] extends {
+        requiresType: true;
+    } ? IContainer : ((REQUIREMENTS["item"] extends {
+        validate(player: Player, value: Item): boolean;
+    } ? IContainer : never) | (REQUIREMENTS["item"] extends {
+        validateType(player: Player, value: ItemType, description?: IItemDescription): boolean;
+    } ? IContainer : never))) | (REQUIREMENTS["item"] extends {
+        finder: ItemFinder;
+    } ? IContainer : never));
     itemQuality: ((REQUIREMENTS["item"] extends true ? ArrayOr<Quality> : never) | (undefined extends REQUIREMENTS["item"] ? undefined : never) | (REQUIREMENTS["item"] extends {
         allowNone: true;
     } ? undefined : never) | (REQUIREMENTS["item"] extends {

package/definitions/game/game/entity/action/usable/UsableAction.d.ts

@@ -27,6 +27,12 @@ import Message from "@wayward/game/language/dictionary/Message";
 import type { HighlightSelector } from "@wayward/game/ui/util/IHighlight";
 import Observer from "@wayward/game/utilities/Observer";
 import EventEmitter from "@wayward/utilities/event/EventEmitter";
+export interface IUsableActionResolveUsingOptions {
+    /** Whether to skip filling in the `fromTile` and `targetTile` properties. Defaults to `true` */
+    skipTiles?: boolean;
+    /** Whether to skip filling in the `item`. Defaults to `false` */
+    skipItem?: boolean;
+}
 export interface IUsableActionEvents {
     preExecute(player: Player, using: IUsableActionPossibleUsing, context: IUsableActionExecutionContext): any;
     postExecute(player: Player, using: IUsableActionPossibleUsing, context: IUsableActionExecutionContext): any;
@@ -35,6 +41,7 @@ export interface IUsableActionEvents {
      * Emitted when the UsableAction should be updated, exclusively for cached UsableActions.
      */
     update(): any;
+    dispose(): any;
 }
 /**
  * Create a basic usable action:
@@ -54,7 +61,13 @@ declare class UsableAction<REQUIREMENTS extends IUsableActionRequirements = IUsa
     readonly definition: DEFINITION;
     id: ActionId;
     readonly observe: Observer.IRegistrar<this>;
+    private usersCount;
+    readonly users: WeakMap<UsableActionRegistrar, true>;
+    private _disposed;
+    get disposed(): boolean;
     constructor(requirements: REQUIREMENTS, definition: DEFINITION);
+    addUser(user: UsableActionRegistrar): this;
+    removeUser(user: UsableActionRegistrar): this;
     is(id?: ActionId): boolean;
     isExecutable(): this is UsableAction<REQUIREMENTS, IUsableActionDefinitionExecutable<REQUIREMENTS>>;
     execute(player: Player, provided: IUsableActionUsing<REQUIREMENTS>, context: UsableActionExecutionContext | IUsableActionExecutionContext): {
@@ -63,8 +76,8 @@ declare class UsableAction<REQUIREMENTS extends IUsableActionRequirements = IUsa
     } | {
         used: false;
     };
-    resolveUsing(player: Player, using: IUsableActionUsing<REQUIREMENTS>, fillTiles?: boolean): Message | IUsableActionUsing<REQUIREMENTS>;
-    resolveUsingOrUndefined(player: Player, using: IUsableActionUsing<REQUIREMENTS>, fillTiles?: boolean): IUsableActionUsing<REQUIREMENTS> | undefined;
+    resolveUsing(player: Player, using: IUsableActionUsing<REQUIREMENTS>, options?: IUsableActionResolveUsingOptions): Message | IUsableActionUsing<REQUIREMENTS>;
+    resolveUsingOrUndefined(player: Player, using: IUsableActionUsing<REQUIREMENTS>, options?: IUsableActionResolveUsingOptions): IUsableActionUsing<REQUIREMENTS> | undefined;
     isUsable(player: Player, provided: IUsableActionUsing<REQUIREMENTS>, context: UsableActionExecutionContext | IUsableActionExecutionContext): UsableActionUsability<REQUIREMENTS>;
     isApplicable(player: Player, provided?: IUsableActionPossibleUsing, fullUsabilityCheck?: boolean, requireItem?: boolean): provided is IUsableActionUsing<REQUIREMENTS>;
     private isItemApplicable;
@@ -102,6 +115,10 @@ declare class UsableAction<REQUIREMENTS extends IUsableActionRequirements = IUsa
     getInternalActionType(): ActionType | undefined;
     getAlignment(using?: IUsableActionPossibleUsing): DeityReal[];
     getInteractionDistance(provided?: IUsableActionPossibleUsing): InteractionDistance | undefined;
+    dispose(): void;
+    private readonly playerDisposalBindings;
+    private bindPlayerDisposal;
+    private clearItemFinderCache;
 }
 export interface IUsableActionFactory<REQUIREMENTS extends IUsableActionRequirements> {
     create: <DEFINITION extends IUsableActionDefinition<REQUIREMENTS>>(action: DEFINITION) => UsableAction<REQUIREMENTS, DEFINITION>;

package/definitions/game/game/entity/action/usable/UsableActionRegistrar.d.ts

@@ -15,11 +15,16 @@ import type UsableAction from "@wayward/game/game/entity/action/usable/UsableAct
 import ContextMenu from "@wayward/game/ui/component/ContextMenu";
 import type { IVector2 } from "@wayward/game/utilities/math/IVector";
 import EventEmitter from "@wayward/utilities/event/EventEmitter";
-export default class UsableActionRegistrar {
+export interface UsableActionRegistrarEvents {
+    dispose(): any;
+}
+export default class UsableActionRegistrar extends EventEmitter.Host<UsableActionRegistrarEvents> {
     readonly id: string;
     readonly actions: Array<[string, UsableAction]>;
     readonly actionIndices: Record<string, number>;
     readonly actionIds: string[];
+    private readonly _disposed;
+    get disposed(): boolean;
     constructor(id: string);
     byId(id?: ActionId): UsableAction | undefined;
     filter(filter: (action: UsableAction, id: string) => any): UsableActionRegistrar;
@@ -30,6 +35,7 @@ export default class UsableActionRegistrar {
     showContextMenu(provided: IUsableActionPossibleUsing, contextMenu?: ContextMenu<ActionId>, context?: ActionDisplayLevel, initialiser?: (contextMenu: ContextMenu<ActionId>) => any, position?: IVector2): ContextMenu<ActionId> | undefined;
     static getContextMenuActionExecutionContext(provided: IUsableActionPossibleUsing): IUsableActionExecutionContext;
     createContextMenu(provided: IUsableActionPossibleUsing, contextMenu?: ContextMenu<ActionId>, context?: ActionDisplayLevel, initialiser?: (contextMenu: ContextMenu<ActionId>) => any): ContextMenu<ActionId> | undefined;
+    dispose(): void;
 }
 export interface IUsableActionGeneratorEvents {
     stopPersisting(): any;

package/definitions/game/game/entity/ai/AI.d.ts

@@ -110,6 +110,10 @@ export interface IAiMaskDescription {
      * Whether this AI mask should currently be applied
      */
     condition?(entity: Entity): boolean;
+    /**
+     * Called when changing whether the AI mask is applied to the entity
+     */
+    onChange?(entity: Entity, change: ChangeAiType): void;
 }
 export declare const aiMaskDescriptions: OptionalDescriptions<AiMaskType, IAiMaskDescription>;
 export declare enum ChangeAiType {

package/definitions/game/game/entity/ai/AiManager.d.ts

@@ -33,9 +33,9 @@ export default class AiManager<ENTITY extends EntityMovable = EntityMovable> {
     aiMasks: AiMaskType[];
     private lastCalculatedAi;
     private wanderIntent?;
-    private entityRef?;
+    private readonly entityRef?;
+    constructor(entity: ENTITY);
     get entity(): ENTITY | undefined;
-    set entity(entity: ENTITY | undefined);
     protected get entityEvent(): IEventEmitter<EntityMovable, IEntityMovableEvents & IEntityAiEvents> | undefined;
     protected get island(): Island | undefined;
     /**

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

@@ -27,7 +27,7 @@ import type Corpse from "@wayward/game/game/entity/creature/corpse/Corpse";
 import type { CreatureZone } from "@wayward/game/game/entity/creature/zone/CreatureZone";
 import type NPC from "@wayward/game/game/entity/npc/NPC";
 import type Player from "@wayward/game/game/entity/player/Player";
-import { StatusType } from "@wayward/game/game/entity/status/IStatus";
+import { StatusApplicability } from "@wayward/game/game/entity/status/IStatus";
 import type { IUncastableContainer } from "@wayward/game/game/item/IItem";
 import type Item from "@wayward/game/game/item/Item";
 import type { Reference, ReferenceType } from "@wayward/game/game/reference/IReferenceManager";
@@ -50,6 +50,7 @@ export default class Creature extends EntityWithStats<ICreatureDescription, Crea
     fromX: number;
     fromY: number;
     aberrant?: true;
+    ai: AiManager<this>;
     enemy?: {
         reference: Reference;
         attacks: number;
@@ -64,7 +65,6 @@ export default class Creature extends EntityWithStats<ICreatureDescription, Crea
     };
     respawned?: number;
     zonePoint?: IVector3;
-    ai: AiManager;
     spawnAnimationTime: IMovementTime | undefined;
     constructor(entityOptions?: IEntityConstructorOptions<CreatureType>, aberrant?: boolean);
     initializeAi(resetAiType?: boolean): void;
@@ -83,6 +83,7 @@ export default class Creature extends EntityWithStats<ICreatureDescription, Crea
      * - `creature.getName(undefined, 3)` // "acid spitter demons"
      */
     getName(article?: Article, count?: number): Translation;
+    protected get typeEnum(): typeof CreatureType;
     protected getDescription(): ICreatureDescription | undefined;
     get isHostile(): boolean;
     get canAlert(): boolean;
@@ -91,7 +92,7 @@ export default class Creature extends EntityWithStats<ICreatureDescription, Crea
     get isTamed(): boolean;
     get isValid(): boolean;
     getCommandedAiType(): AiType | undefined;
-    protected getApplicableStatuses(): Set<StatusType> | undefined;
+    protected getStatusApplicability(): StatusApplicability | undefined;
     tickStatuses(): void;
     getDefense(human?: Human): Defense;
     /**

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

@@ -68,7 +68,7 @@ export default class CreatureManager extends EntityManager<Creature, {
     /**
      * getMovePenalty
      * @param willMove Set to true if the object is about to move to this tile. This method will confirm if there's an existing npc/creature there and return false if so
-     * @return Blocked penalty - Do no return 0!
+     * @return Blocked penalty - Do not return 0!
      */
     getMovePenalty(moveType: MoveType, tile: Tile, willMove: boolean, options?: Partial<ICreatureCheckMoveOptions>, creature?: Creature): number;
     /**

package/definitions/game/game/entity/creature/corpse/Corpse.d.ts

@@ -90,6 +90,7 @@ export default class Corpse extends Entity<ICorpseDescription, CreatureType, Ref
      * - `corpse.getName(undefined, 3)` // "acid spitter demons"
      */
     getName(article?: Article, count?: number): Translation;
+    protected get typeEnum(): typeof CreatureType;
     protected getDescription(): ICorpseDescription | undefined;
     creatureDescription(): ICreatureDescription | undefined;
     get isValid(): boolean;

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

@@ -21,14 +21,14 @@ import { AiType, ChangeAiType } from "@wayward/game/game/entity/ai/AI";
 import type { IEntityAiEvents } from "@wayward/game/game/entity/ai/AiManager";
 import AiManager from "@wayward/game/game/entity/ai/AiManager";
 import type { INPCDescription } from "@wayward/game/game/entity/npc/INPC";
-import type { NPCType } from "@wayward/game/game/entity/npc/INPCs";
+import { NPCType } from "@wayward/game/game/entity/npc/INPCs";
 import type MerchantNPC from "@wayward/game/game/entity/npc/npcs/Merchant";
 import type ShipperNPC from "@wayward/game/game/entity/npc/npcs/Shipper";
 import { MessageManagerNoOp } from "@wayward/game/game/entity/player/MessageManager";
 import type Player from "@wayward/game/game/entity/player/Player";
 import { NoteManagerNoOp } from "@wayward/game/game/entity/player/note/NoteManager";
 import { QuestManagerNoOp } from "@wayward/game/game/entity/player/quest/QuestManager";
-import { StatusType } from "@wayward/game/game/entity/status/IStatus";
+import { StatusApplicability } from "@wayward/game/game/entity/status/IStatus";
 import type { IContainer, ItemType } from "@wayward/game/game/item/IItem";
 import type Item from "@wayward/game/game/item/Item";
 import type { ReferenceType } from "@wayward/game/game/reference/IReferenceManager";
@@ -58,14 +58,15 @@ export default abstract class NPC extends Human<INPCDescription, NPCType, Refere
     get entityType(): EntityType.NPC;
     get tileUpdateType(): TileUpdateType;
     event: IEventEmitter<this, INPCEvents>;
-    seen: number;
     private weightCapacity;
-    talked?: Map<string, number>;
+    ai: AiManager<this>;
     interactions?: Map<string, Set<number>>;
-    ai: AiManager;
+    seen: number;
+    talked?: Map<string, number>;
     static getRegistrarId(): number;
     static setRegistrarId(id: number): void;
     constructor(entityOptions?: IEntityConstructorOptions<NPCType>);
+    protected get typeEnum(): typeof NPCType;
     getDescription(): INPCDescription | undefined;
     getWeightCapacity(): number;
     getRegistrarId(): number;
@@ -73,9 +74,8 @@ export default abstract class NPC extends Human<INPCDescription, NPCType, Refere
     createMessageManager(): MessageManagerNoOp;
     createQuestManager(): QuestManagerNoOp;
     addMilestone(): void;
-    protected getApplicableStatuses(): Set<StatusType> | undefined;
+    protected getStatusApplicability(): StatusApplicability | undefined;
     get isValid(): boolean;
-    load(): void;
     /**
      * Creates inventory, equips items, and scales stats
      */