@wayward/types 2.12.0-beta.dev.20220831.1 → 2.12.0-beta.dev.20220903.1

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

@@ -16,7 +16,7 @@ import type Human from "game/entity/Human";
 import type { Defense } from "game/entity/IEntity";
 import { DamageType } from "game/entity/IEntity";
 import type { Delay } from "game/entity/IHuman";
-import type { TurnType } from "game/entity/player/IPlayer";
+import type { TurnTypeFlag } from "game/entity/player/IPlayer";
 import type { IGameEvents, IMovementTime, IPlayOptions, ISynchronizeState } from "game/IGame";
 import { PauseSource, SaveType, TickFlag, TurnMode } from "game/IGame";
 import type Island from "game/island/Island";
@@ -132,7 +132,7 @@ export declare class Game extends EventEmitter.Host<IGameEvents> {
      * Marks that the human had a turn
      * In manual turn mode, it will tick the humans stat timers & the game
      */
-    passTurn(human: Human, turnType?: TurnType): void;
+    passTurn(human: Human, turnType?: TurnTypeFlag): void;
     tickRealtime(): void;
     updateView(source: RenderSource, updateFov?: boolean, computeSpritesNow?: boolean): void;
     updateTablesAndWeight(): void;

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

@@ -154,6 +154,7 @@ export default class Doodad extends EventEmitter.Host<IDoodadEvents> implements
      */
     isGatherable(): boolean;
     isEmbers(): boolean;
+    getVehicle(): import("game/item/IItem").IItemVehicle | undefined;
     isVehicle(): boolean;
     canHarvest(): boolean;
     /**

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

@@ -66,6 +66,7 @@ export default abstract class Entity extends EventEmitter.Host<IEntityEvents> im
     attackAnimationType: DamageType | undefined;
     attackAnimationTime: IMovementTime | undefined;
     isMovingClientside: boolean;
+    allowSmartMovementClientside: boolean;
     protected _movementTime: {
         start: number;
         end: number;

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

@@ -21,7 +21,7 @@ import type { IStat } from "game/entity/IStats";
 import { Stat } from "game/entity/IStats";
 import type { IMessageManager } from "game/entity/player/IMessageManager";
 import type { ILoadOnIslandOptions, IMobCheck, IMovementIntent, IWalkPath } from "game/entity/player/IPlayer";
-import { PlayerState, TurnType, WeightStatus } 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";
 import type { IQuestManager } from "game/entity/player/quest/QuestManager";
@@ -241,12 +241,12 @@ export default abstract class Human extends Entity implements IHasInsulation {
     private recalculateInsulation;
     private getEquipmentInsulation;
     discoverRecipe(recipeType: ItemType, crafted?: ICrafted, discoveredClientSide?: boolean): void;
-    passTurn(turnType?: TurnType): void;
+    passTurn(turnType?: TurnTypeFlag): void;
     /**
      * Ticks a player
      * @returns True if the game should tick after this
      */
-    tick(isPassTurn?: boolean): boolean;
+    tick(isPassTurn?: boolean, turnType?: TurnTypeFlag): boolean;
     private restTick;
     getDamage(causesDamage: ICausesDamage, equipType?: EquipType): number;
     private slitherSuckerDamage;

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

@@ -25,6 +25,7 @@ import { ItemType, ItemTypeGroup, RecipeLevel } from "game/item/IItem";
 import type Item from "game/item/Item";
 import { TempType } from "game/temperature/ITemperature";
 import type { ITile } from "game/tile/ITerrain";
+import Message from "language/dictionary/Message";
 import type { IModdable } from "mod/ModRegistry";
 import type { IOptions } from "save/data/ISaveDataGlobal";
 import type { IRGB } from "utilities/Color";
@@ -330,8 +331,10 @@ export declare enum RestCancelReason {
     NearbyCreatureDamagedDoodad = 3,
     CreatureDamaged = 4,
     Canceled = 5,
-    Dying = 6
+    Dying = 6,
+    WaterPoured = 7
 }
+export declare const restCancelReasonMessageMap: Record<RestCancelReason, Message | undefined>;
 export interface IRestData {
     type: RestType;
     startHealth: number;
@@ -339,7 +342,7 @@ export interface IRestData {
     itemId?: number;
     doodadId?: number;
     cycle?: number;
-    cancelReason?: RestCancelReason;
+    cancelReason?: Set<RestCancelReason>;
 }
 export declare enum RestType {
     Resting = 0,

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

@@ -14,7 +14,7 @@ import type { AnyActionDescription, IActionApi, IActionArgumentTypeMap, IActionC
 import { ActionArgument, ActionType } from "game/entity/action/IAction";
 import type Entity from "game/entity/Entity";
 import type { SkillType } from "game/entity/IHuman";
-import type { TurnType } from "game/entity/player/IPlayer";
+import type { TurnTypeFlag } from "game/entity/player/IPlayer";
 import type Item from "game/item/Item";
 import type { IPromptDescriptionBase, PromptDescriptionArgs } from "game/meta/prompt/IPrompt";
 import { Milestone } from "game/milestones/IMilestone";
@@ -106,7 +106,7 @@ export default class ActionExecutor<A extends Array<ActionArgument | ActionArgum
     prompt<PROMPT extends IPromptDescriptionBase<any[]>>(prompt: PROMPT, ...args: PromptDescriptionArgs<PROMPT>): Promise<boolean>;
     isArgumentType<AA extends ActionArgument>(argument: any, index: number, argumentType: AA): argument is IActionArgumentTypeMap[AA];
     setDelay(delay: number, replace?: boolean): this;
-    setPassTurn(turnType?: TurnType): this;
+    setPassTurn(turnType?: TurnTypeFlag): this;
     setUpdateView(updateFov?: boolean): this;
     setUpdateRender(): this;
     setUpdateTablesAndWeight(): this;

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

@@ -32,6 +32,7 @@ export declare const actionDescriptionsSlow: {
     13: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/Dig").IDigGenericCanUse | import("game/entity/action/actions/Dig").IDigTileCanUse, [(import("../../item/Item").default | undefined)?]>;
     0: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby, [import("game/entity/action/IAction").ActionArgument.OptionalItemArrayNearby, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/Disassemble").IDisassembleCanUse, [import("../../item/Item").default, ((import("../../item/Item").default | undefined)[] | undefined)?]>;
     40: 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, void, import("game/entity/action/actions/Dismantle").IDismantleCanUse, [import("../../item/Item").default, (import("../../item/Item").default | undefined)?]>;
+    113: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [(import("../../doodad/Doodad").default | import("../../item/Item").default | undefined)?]>;
     39: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default, void, import("game/entity/action/IAction").IActionUsable, [import("../../item/Item").default]>;
     62: import("./Action").Action<[], import("../Human").default, void, import("game/entity/action/actions/DrinkInFront").IDrinkInFrontCanUse, []>;
     8: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default, void, import("./actions/ConsumeItem").IConsumeItemCanUse, [import("../../item/Item").default]>;
@@ -45,9 +46,7 @@ export declare const actionDescriptionsSlow: {
     36: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default, void, import("game/entity/action/IAction").IActionUsable, [import("../../item/Item").default]>;
     22: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/Gather").IGatherCanUse, [(import("../../item/Item").default | undefined)?]>;
     15: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default, void, import("game/entity/action/actions/GatherLiquid").IGatherLiquidCanUse, [import("../../item/Item").default]>;
-    86: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearbyIncludingTradeContainer, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Container, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.ItemType, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Quality, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.String, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, {
-        usable: true;
-    }, [(import("../../item/Item").default | undefined)?, (import("../../item/IItem").IContainer | undefined)?, (import("../../item/IItem").ItemType | undefined)?, (import("../../IObject").Quality | undefined)?, (string | undefined)?]>;
+    86: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearbyIncludingTradeContainer, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Container, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.ItemType, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Quality, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.String, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/MoveItem").MoveItemCanUse, [(import("../../item/Item").default | undefined)?, (import("../../item/IItem").IContainer | undefined)?, (import("../../item/IItem").ItemType | undefined)?, (import("../../IObject").Quality | undefined)?, (string | undefined)?]>;
     52: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default, void, import("game/entity/action/actions/Grasp").IGraspCanUse, [import("../../item/Item").default]>;
     69: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/Harvest").IHarvestCanUse, [(import("../../item/Item").default | undefined)?]>;
     12: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default, void, import("./actions/ConsumeItem").IConsumeItemCanUse, [import("../../item/Item").default]>;
@@ -65,9 +64,7 @@ export declare const actionDescriptionsSlow: {
     58: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.Direction], import("../Human").default, void, {
         usable: true;
     }, [import("../../../utilities/math/Direction").Direction.None | import("../../../utilities/math/Direction").Direction.East | import("../../../utilities/math/Direction").Direction.North | import("../../../utilities/math/Direction").Direction.West | import("../../../utilities/math/Direction").Direction.South]>;
-    65: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearbyIncludingTradeContainer, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Container, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.ItemType, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Quality, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.String, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, {
-        usable: true;
-    }, [(import("../../item/Item").default | undefined)?, (import("../../item/IItem").IContainer | undefined)?, (import("../../item/IItem").ItemType | undefined)?, (import("../../IObject").Quality | undefined)?, (string | undefined)?]>;
+    65: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearbyIncludingTradeContainer, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Container, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.ItemType, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Quality, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.String, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/MoveItem").MoveItemCanUse, [(import("../../item/Item").default | undefined)?, (import("../../item/IItem").IContainer | undefined)?, (import("../../item/IItem").ItemType | undefined)?, (import("../../IObject").Quality | undefined)?, (string | undefined)?]>;
     59: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.Vector2, [import("game/entity/action/IAction").ActionArgument.Direction, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, {
         usable: true;
     }, [import("../../../utilities/math/IVector").IVector2, (import("../../../utilities/math/Direction").Direction.None | import("../../../utilities/math/Direction").Direction.East | import("../../../utilities/math/Direction").Direction.North | import("../../../utilities/math/Direction").Direction.West | import("../../../utilities/math/Direction").Direction.South | undefined)?]>;
@@ -76,9 +73,8 @@ export declare const actionDescriptionsSlow: {
     31: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default, void, import("game/entity/action/IAction").IActionUsable, [import("../../item/Item").default]>;
     29: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.Container, import("game/entity/action/IAction").ActionArgument.Undefined], [import("game/entity/action/IAction").ActionArgument.Boolean, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/ToggleContainer").IToggleContainerCanUse, [(import("../../item/IItem").IContainer | undefined)?, (boolean | undefined)?]>;
     49: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.Doodad, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, true | undefined, import("game/entity/action/actions/ToggleDoor").IToggleDoorCanUse, [(import("../../doodad/Doodad").default | undefined)?]>;
-    108: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad]], import("../Human").default, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [import("../../doodad/Doodad").default | import("../../item/Item").default]>;
     111: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/ToggleTilled").ITillCanUse, [(import("../../item/Item").default | undefined)?]>;
-    14: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad]], import("../Human").default, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [import("../../doodad/Doodad").default | import("../../item/Item").default]>;
+    14: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [(import("../../doodad/Doodad").default | import("../../item/Item").default | undefined)?]>;
     43: import("./Action").Action<[], import("../Human").default, void, import("game/entity/action/actions/Pet").IPetCanUse, []>;
     1: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/PickUp").IPickUpCanUse, [(import("../../item/Item").default | undefined)?]>;
     54: import("./Action").Action<[], import("../Human").default, void, import("game/entity/action/actions/PickUpAllItems").IPickUpAllItemsCanUse, []>;
@@ -129,7 +125,7 @@ export declare const actionDescriptionsSlow: {
     103: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.Doodad, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, true | undefined, import("game/entity/action/actions/ToggleDoor").IToggleDoorCanUse, [(import("../../doodad/Doodad").default | undefined)?]>;
     101: import("./Action").Action<[], import("../Human").default, void, import("game/entity/action/actions/ToggleHitch").IToggleHitchCanUse, []>;
     112: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/ToggleTilled").ITillCanUse, [(import("../../item/Item").default | undefined)?]>;
-    102: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad]], import("../Human").default, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [import("../../doodad/Doodad").default | import("../../item/Item").default]>;
+    102: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [(import("../../doodad/Doodad").default | import("../../item/Item").default | undefined)?]>;
     73: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.NPCNearby], import("../Human").default, void, import("game/entity/action/IAction").IActionUsable, [import("../npc/NPC").default]>;
     35: import("./Action").Action<[import("game/entity/action/IAction").ActionArgument.ItemInventory, [import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/actions/Transmogrify").ITransmogrifyCanUse, [import("../../item/Item").default, (import("../../item/Item").default | undefined)?]>;
     64: import("./Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemInventory, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../Human").default, void, import("game/entity/action/IAction").IActionUsable, [(import("../../item/Item").default | undefined)?]>;

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

@@ -20,7 +20,7 @@ import type { EquipType, RestType, SkillType } from "game/entity/IHuman";
 import type NPC from "game/entity/npc/NPC";
 import type { MessageType } from "game/entity/player/IMessageManager";
 import { Source } from "game/entity/player/IMessageManager";
-import type { TurnType } from "game/entity/player/IPlayer";
+import type { TurnTypeFlag } from "game/entity/player/IPlayer";
 import type Player from "game/entity/player/Player";
 import type { Quality } from "game/IObject";
 import type Island from "game/island/Island";
@@ -51,7 +51,7 @@ export declare enum ActionType {
     Sleep = 11,
     Heal = 12,
     Dig = 13,
-    Paddle = 14,
+    Ride = 14,
     GatherLiquid = 15,
     Cast = 16,
     Lockpick = 17,
@@ -145,11 +145,12 @@ export declare enum ActionType {
     UpdateOption = 105,
     UpdateGameOption = 106,
     UpdateWalkPath = 107,
-    Operate = 108,
+    Unused2 = 108,
     Absorb = 109,
     Exude = 110,
     PackGround = 111,
-    ToggleTilled = 112
+    ToggleTilled = 112,
+    DismountVehicle = 113
 }
 export declare enum ActionUsability {
     Paused = 0,
@@ -249,7 +250,7 @@ export interface IActionApi<E extends Entity = Entity, CU extends IActionUsable
      */
     isCreatureBlocking(tile: ITile): boolean;
     setDelay(delay: number, replace?: boolean): this;
-    setPassTurn(turnType?: TurnType): this;
+    setPassTurn(turnType?: TurnTypeFlag): this;
     setUpdateView(updateFov?: boolean): this;
     setUpdateRender(): this;
     setUpdateTablesAndWeight(): this;

package/definitions/game/game/entity/action/actions/{Operate.d.ts → Dismount.d.ts}

@@ -8,5 +8,5 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-declare const _default: import("../Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad]], import("../../Human").default, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [import("../../../doodad/Doodad").default | import("../../../item/Item").default]>;
+declare const _default: import("../Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../../Human").default, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [(import("../../../doodad/Doodad").default | import("../../../item/Item").default | undefined)?]>;
 export default _default;

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

@@ -8,7 +8,5 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-declare const _default: import("../Action").Action<[[import("../IAction").ActionArgument.ItemNearbyIncludingTradeContainer, import("../IAction").ActionArgument.Undefined], [import("../IAction").ActionArgument.Container, import("../IAction").ActionArgument.Undefined], [import("../IAction").ActionArgument.ItemType, import("../IAction").ActionArgument.Undefined], [import("../IAction").ActionArgument.Quality, import("../IAction").ActionArgument.Undefined], [import("../IAction").ActionArgument.String, import("../IAction").ActionArgument.Undefined]], import("../../Human").default, void, {
-    usable: true;
-}, [(import("../../../item/Item").default | undefined)?, (import("../../../item/IItem").IContainer | undefined)?, (import("../../../item/IItem").ItemType | undefined)?, (import("../../../IObject").Quality | undefined)?, (string | undefined)?]>;
+declare const _default: import("../Action").Action<[[import("../IAction").ActionArgument.ItemNearbyIncludingTradeContainer, import("../IAction").ActionArgument.Undefined], [import("../IAction").ActionArgument.Container, import("../IAction").ActionArgument.Undefined], [import("../IAction").ActionArgument.ItemType, import("../IAction").ActionArgument.Undefined], [import("../IAction").ActionArgument.Quality, import("../IAction").ActionArgument.Undefined], [import("../IAction").ActionArgument.String, import("../IAction").ActionArgument.Undefined]], import("../../Human").default, void, import("game/entity/action/actions/MoveItem").MoveItemCanUse, [(import("../../../item/Item").default | undefined)?, (import("../../../item/IItem").IContainer | undefined)?, (import("../../../item/IItem").ItemType | undefined)?, (import("../../../IObject").Quality | undefined)?, (string | undefined)?]>;
 export default _default;

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

@@ -9,11 +9,40 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import { Action } from "game/entity/action/Action";
+import type { IActionUsable } from "game/entity/action/IAction";
 import { ActionArgument } from "game/entity/action/IAction";
 import type Human from "game/entity/Human";
+import type MerchantNPC from "game/entity/npc/npcs/Merchant";
+import type { IMerchantBuyPrice } from "game/entity/npc/npcs/Merchant";
 import type { IContainer } from "game/item/IItem";
 import type Item from "game/item/Item";
-declare const _default: Action<[[ActionArgument.ItemNearbyIncludingTradeContainer, ActionArgument.Undefined], [ActionArgument.Container, ActionArgument.Undefined], [ActionArgument.ItemType, ActionArgument.Undefined], [ActionArgument.Quality, ActionArgument.Undefined], [ActionArgument.String, ActionArgument.Undefined]], Human, void, {
-    usable: true;
-}, [(Item | undefined)?, (IContainer | undefined)?, (import("game/item/IItem").ItemType | undefined)?, (import("../../../IObject").Quality | undefined)?, (string | undefined)?]>;
+import Translation from "language/Translation";
+export interface IMoveItemBuyItemFromMerchantCanUse extends IActionUsable {
+    type: "BuyItemFromMerchant";
+    item: Item;
+    merchant: MerchantNPC;
+    targetContainer: IContainer;
+    sellPrice: number;
+}
+export interface IMoveItemSellItemFromMerchantCanUse extends IActionUsable {
+    type: "SellItemToMerchant";
+    item: Item;
+    merchant: MerchantNPC;
+    targetContainer: IContainer;
+    buyPrice: IMerchantBuyPrice;
+}
+export interface IMoveItemSingleItemCanUse extends IActionUsable {
+    type: "MoveSingleItem";
+    item: Item;
+    targetContainer: IContainer;
+    containerName: Translation | undefined;
+}
+export interface IMoveItemMultipleItemsCanUse extends IActionUsable {
+    type: "MoveMultipleItems";
+    fromContainer: IContainer;
+    targetContainer: IContainer;
+    containerName: Translation | undefined;
+}
+export declare type MoveItemCanUse = IMoveItemBuyItemFromMerchantCanUse | IMoveItemSellItemFromMerchantCanUse | IMoveItemSingleItemCanUse | IMoveItemMultipleItemsCanUse;
+declare const _default: Action<[[ActionArgument.ItemNearbyIncludingTradeContainer, ActionArgument.Undefined], [ActionArgument.Container, ActionArgument.Undefined], [ActionArgument.ItemType, ActionArgument.Undefined], [ActionArgument.Quality, ActionArgument.Undefined], [ActionArgument.String, ActionArgument.Undefined]], Human, void, MoveItemCanUse, [(Item | undefined)?, (IContainer | undefined)?, (import("game/item/IItem").ItemType | undefined)?, (import("../../../IObject").Quality | undefined)?, (string | undefined)?]>;
 export default _default;

package/definitions/game/game/entity/action/actions/{Paddle.d.ts → Ride.d.ts}

@@ -8,5 +8,5 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-declare const _default: import("../Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad]], import("../../Human").default, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [import("../../../doodad/Doodad").default | import("../../../item/Item").default]>;
+declare const _default: import("../Action").Action<[[import("game/entity/action/IAction").ActionArgument.ItemNearby, import("game/entity/action/IAction").ActionArgument.Doodad, import("game/entity/action/IAction").ActionArgument.Undefined]], import("../../Human").default, void, import("game/entity/action/actions/ToggleVehicle").ToggleVehicleCanUse, [(import("../../../doodad/Doodad").default | import("../../../item/Item").default | undefined)?]>;
 export default _default;

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

@@ -29,5 +29,5 @@ export interface ToggleVehicleItemCanUse extends IActionUsable {
     facingTile?: ITile;
 }
 export declare type ToggleVehicleCanUse = ToggleVehicleDoodadCanUse | ToggleVehicleItemCanUse;
-declare const _default: Action<[[ActionArgument.ItemNearby, ActionArgument.Doodad]], import("../../Human").default, void, ToggleVehicleCanUse, [Doodad | Item]>;
+declare const _default: Action<[[ActionArgument.ItemNearby, ActionArgument.Doodad, ActionArgument.Undefined]], import("../../Human").default, void, ToggleVehicleCanUse, [(Doodad | Item | undefined)?]>;
 export default _default;

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

@@ -142,7 +142,7 @@ export interface IUsableActionDefinitionBase<REQUIREMENTS extends IUsableActionR
     /**
      * The icon this action should have, if any.
      */
-    icon?: UsableActionIconReference;
+    icon?: SupplierOr<UsableActionIconReference, [using: IUsableActionPossibleUsing, action: UsableAction<REQUIREMENTS>]>;
     /**
      * Where the icon should appear, when slotted with an item. Defaults to bottom right.
      *
@@ -261,14 +261,14 @@ declare class UsableAction<REQUIREMENTS extends IUsableActionRequirements = IUsa
     getDoodad(player: Player, provided?: IUsableActionPossibleUsing): false | Doodad | undefined;
     getCreature(player: Player, provided?: IUsableActionPossibleUsing): false | Creature | undefined;
     getNPC(player: Player, provided?: IUsableActionPossibleUsing): false | NPC | undefined;
-    getIcon(): {
+    getIcon(provided: IUsableActionPossibleUsing): {
         path: ImagePath<PathType.Action>;
         width: number;
         height: number;
     } | undefined;
     getHighlightSelectors(using?: IUsableActionPossibleUsing): HighlightSelector[];
     private translator?;
-    getTranslation(using?: IUsableActionUsing<REQUIREMENTS>, which?: ActionTranslation): TranslationImpl | undefined;
+    getTranslation(using?: IUsableActionUsing<REQUIREMENTS>, which?: ActionTranslation): Translation | undefined;
     getOrder(using?: IUsableActionPossibleUsing): number;
 }
 export declare class UsableActionTranslator {
@@ -276,9 +276,9 @@ export declare class UsableActionTranslator {
     private nameSupplier?;
     private descriptionSupplier?;
     constructor(id: ActionId);
-    name(supplier: SupplierOr<Translation, [IUsableActionPossibleUsing]>): this;
-    description(supplier: SupplierOr<Translation, [IUsableActionPossibleUsing]>): this;
-    get(using?: IUsableActionPossibleUsing, which?: ActionTranslation): TranslationImpl | undefined;
+    name(supplier: SupplierOr<Translation, [using: IUsableActionPossibleUsing, action: UsableAction]>): this;
+    description(supplier: SupplierOr<Translation, [using: IUsableActionPossibleUsing, action: UsableAction]>): this;
+    get(action: UsableAction, using?: IUsableActionPossibleUsing, which?: ActionTranslation): Translation | undefined;
 }
 export interface IUsableActionFactory<REQUIREMENTS extends IUsableActionRequirements> {
     create: <DEFINITION extends IUsableActionDefinition<REQUIREMENTS>>(action: DEFINITION) => UsableAction<REQUIREMENTS, DEFINITION>;

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

@@ -61,5 +61,7 @@ export declare enum UsableActionType {
 export declare enum UsableActionTypePlaceholder {
     TradeItem = 2000000,
     MoveAllToInventory = 2000001,
-    MoveAllOfSameQualityToInventory = 2000002
+    MoveAllOfSameQualityToInventory = 2000002,
+    Paddle = 2000003,
+    Operate = 2000004
 }

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

@@ -18,15 +18,16 @@ export interface IUsableActionDynamicDefinition {
     icon?: UsableActionIconReference;
     bindable: Bindable;
     displayLevel?: ActionDisplayLevel;
+    order?: number;
 }
 export interface IUsableActionsDynamicConfig<DEFINITION extends IUsableActionDynamicDefinition, REQUIREMENTS extends IUsableActionRequirements> {
     id: string;
     record: PartialRecord<ActionType, DEFINITION | false>;
     getDynamic(actions: Set<ActionType>): any;
     requirements?(action: ActionType, definition?: DEFINITION): REQUIREMENTS;
-    isUsable(action: ActionType, player: Player, using: IUsableActionUsing<REQUIREMENTS>): ReturnableUsableActionUsability;
-    execute(action: ActionType, player: Player, using: IUsableActionUsing<REQUIREMENTS>): any;
-    order?(action: ActionType, using: IUsableActionPossibleUsing): number | undefined;
+    isUsable(action: ActionType, player: Player, using: IUsableActionUsing<REQUIREMENTS>, definition?: DEFINITION): ReturnableUsableActionUsability;
+    execute(action: ActionType, player: Player, using: IUsableActionUsing<REQUIREMENTS>, definition?: DEFINITION): any;
+    order?(action: ActionType, using: IUsableActionPossibleUsing, definition?: DEFINITION): number | undefined;
 }
 export default class UsableActionsDynamic<DEFINITION extends IUsableActionDynamicDefinition, REQUIREMENTS extends IUsableActionRequirements> extends UsableActionGenerator {
     constructor(config: IUsableActionsDynamicConfig<DEFINITION, REQUIREMENTS>);

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

@@ -17,25 +17,26 @@ export declare enum UsableActionSet {
      * Note that `order` is used to sort "use item/doodad/npc" actions to the top — the actions that appear in {@link IItemDescription.use}.
      */
     First = 0,
-    WithHands = 1,
-    PickUp = 2,
-    Rest = 3,
-    Misc = 4,
-    Till = 5,
-    UseItem = 6,
-    CloseContainer = 7,
-    Equip = 8,
-    Craft = 9,
-    XWithY = 10,
-    ItemMisc = 11,
-    ItemDrop = 12,
-    ItemMoveMenus = 13,
-    Doodads = 14,
-    Creatures = 15,
-    UseNPC = 16,
-    Rename = 17,
-    Protect = 18,
-    Main = 19
+    Vehicle = 1,
+    WithHands = 2,
+    PickUp = 3,
+    Rest = 4,
+    Misc = 5,
+    Till = 6,
+    UseItem = 7,
+    CloseContainer = 8,
+    Equip = 9,
+    Craft = 10,
+    XWithY = 11,
+    ItemMisc = 12,
+    ItemDrop = 13,
+    ItemMoveMenus = 14,
+    Doodads = 15,
+    Creatures = 16,
+    UseNPC = 17,
+    Rename = 18,
+    Protect = 19,
+    Main = 20
 }
 export declare const usableActionSets: {
     0: UsableActionGenerator<[]>;
@@ -44,18 +45,19 @@ export declare const usableActionSets: {
     3: UsableActionGenerator<[]>;
     4: UsableActionGenerator<[]>;
     5: UsableActionGenerator<[]>;
-    6: import("./UsableActionsDynamic").default<import("game/entity/action/usable/actions/item/UsableActionsUseItem").IUseItemAction, import("game/entity/action/usable/UsableAction").IUsableActionRequirements>;
-    7: UsableActionGenerator<[]>;
+    6: UsableActionGenerator<[]>;
+    7: import("./UsableActionsDynamic").default<import("game/entity/action/usable/actions/item/UsableActionsUseItem").IUseItemAction, import("game/entity/action/usable/UsableAction").IUsableActionRequirements>;
     8: UsableActionGenerator<[]>;
     9: UsableActionGenerator<[]>;
     10: UsableActionGenerator<[]>;
     11: UsableActionGenerator<[]>;
-    12: UsableActionGenerator<[isDropMenu?: true | undefined]>;
-    13: UsableActionGenerator<[]>;
+    12: UsableActionGenerator<[]>;
+    13: UsableActionGenerator<[isDropMenu?: true | undefined]>;
     14: UsableActionGenerator<[]>;
     15: UsableActionGenerator<[]>;
-    16: import("./UsableActionsDynamic").default<import("game/entity/action/usable/actions/UsableActionsUseNPC").IUseNPCAction, import("game/entity/action/usable/UsableAction").IUsableActionRequirements>;
-    17: UsableActionGenerator<[]>;
+    16: UsableActionGenerator<[]>;
+    17: import("./UsableActionsDynamic").default<import("game/entity/action/usable/actions/UsableActionsUseNPC").IUseNPCAction, import("game/entity/action/usable/UsableAction").IUsableActionRequirements>;
     18: UsableActionGenerator<[]>;
     19: UsableActionGenerator<[]>;
+    20: UsableActionGenerator<[]>;
 };

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

@@ -0,0 +1,13 @@
+/*!
+ * Copyright 2011-2021 Unlok
+ * https://www.unlok.ca
+ *
+ * Credits & Thanks:
+ * https://www.unlok.ca/credits-thanks/
+ *
+ * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
+ * https://github.com/WaywardGame/types/wiki
+ */
+import { UsableActionGenerator } from "game/entity/action/usable/UsableActionRegistrar";
+declare const _default: UsableActionGenerator<[]>;
+export default _default;

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

@@ -13,11 +13,12 @@ import type Player from "game/entity/player/Player";
 declare namespace IUsableActionsDoodad {
     function getFacing(player: Player, filter?: (doodad: Doodad) => any): Doodad | undefined;
     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) => {
         find: (player: Player) => Doodad | undefined;
     };
-    const requireFacingOrUnder: (filter?: ((doodad: Doodad) => any) | undefined) => {
+    const requireUnderOrFacing: (filter?: ((doodad: Doodad) => any) | undefined) => {
         find: (player: Player) => Doodad | undefined;
     };
 }

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

@@ -11,7 +11,7 @@
 import type { Events, IEventEmitter } from "event/EventEmitter";
 import type { ActionType } from "game/entity/action/IAction";
 import Human from "game/entity/Human";
-import { AiType, EntityType, MoveType } from "game/entity/IEntity";
+import { AiType, EntityType, MoveType, StatusType } from "game/entity/IEntity";
 import type { ICustomizations } from "game/entity/IHuman";
 import { EquipType } from "game/entity/IHuman";
 import type { NPCType } from "game/entity/npc/INPCs";
@@ -63,6 +63,7 @@ export default abstract class NPC extends Human {
     createMessageManager(): MessageManagerNoOp;
     createQuestManager(): QuestManagerNoOp;
     addMilestone(): void;
+    protected getApplicableStatusEffects(): Set<StatusType>;
     /**
      * Creates inventory, equips items, and scales stats
      */

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

@@ -16,15 +16,16 @@ import NPC from "game/entity/npc/NPC";
 import type Player from "game/entity/player/Player";
 import { ItemType } from "game/item/IItem";
 import type Item from "game/item/Item";
+export interface IMerchantBuyPrice {
+    base: number;
+    bonus: number;
+    total: number;
+}
 export default class MerchantNPC extends NPC {
     constructor(id?: number, islandId?: `${number},${number}`, x?: number, y?: number, z?: number);
     getActions(): ActionType[] | undefined;
     getSellPrice(player: Player, item: Item): number | undefined;
-    getBuyPrice(player: Player, item: Item): {
-        base: number;
-        bonus: number;
-        total: number;
-    } | undefined;
+    getBuyPrice(player: Player, item: Item): IMerchantBuyPrice | undefined;
     protected getReputationChangeOnDeath(): number;
     protected getDefaultName(): import("../../../../language/impl/TranslationImpl").default;
     protected initializeStats(): void;
@@ -38,6 +39,10 @@ export default class MerchantNPC extends NPC {
      * Stop stat timers when they would kill
      */
     private capStatTimers;
+    /**
+     * Equip better things when available
+     */
+    private processEquipment;
     /**
      * Try to do something when health is below 20%
      */
@@ -51,4 +56,6 @@ export default class MerchantNPC extends NPC {
      */
     private processThirst;
     get asMerchant(): MerchantNPC;
+    private calculateWeaponEquipItemScore;
+    private calculateDefenseEquipItemScore;
 }

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

@@ -111,10 +111,14 @@ export interface IPlayerEvents extends Events<Human> {
      */
     idChanged(currentId: number, newId: number, isAbsentPlayer: boolean): any;
 }
-export declare enum TurnType {
-    CheckUnderPlayer = 0,
-    DontEnterCaves = 1,
-    Idle = 2
+export declare enum TurnTypeFlag {
+    CheckUnderPlayer = 1,
+    DontEnterCaves = 2,
+    Idle = 4,
+    /**
+     * Indicates the turn is passing due to a movement
+     */
+    Movement = 8
 }
 export interface IAttackHand {
     mainHand: number;

package/definitions/game/game/inspection/infoProviders/Uses.d.ts

@@ -8,7 +8,7 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
-import type { ActionType } from "game/entity/action/IAction";
+import { ActionType } from "game/entity/action/IAction";
 import { InfoProvider } from "game/inspection/InfoProvider";
 import type { InfoProviderContext } from "game/inspection/InfoProviderContext";
 import type UseInfo from "game/inspection/infoProviders/UseInfo";
@@ -36,4 +36,5 @@ export default abstract class Uses<T extends IDescribed> extends InfoProvider {
     private getUseExtraInfo;
     private getDetailsHandlerResolver;
     private getUse;
+    private getUseName;
 }