@wayward/types 2.12.0-beta.dev.20220902.1 → 2.12.0-beta.dev.20220905.1

package/definitions/game/audio/IAudio.d.ts

@@ -55,9 +55,11 @@ export declare enum SfxType {
     UiInput = 28,
     UiInvalid = 29,
     UiOpen = 30,
-    UiSelect = 31,
-    Walk = 32,
-    Water = 33
+    UiProtect = 31,
+    UiSelect = 32,
+    UiUnprotect = 33,
+    Walk = 34,
+    Water = 35
 }
 export declare type SfxUi = Extract<keyof typeof SfxType, `Ui${string}`> extends `Ui${infer RESULT}` ? Lowercase<RESULT> : never;
 export declare enum Music {

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

@@ -15,7 +15,7 @@ import type { IDamageInfo } from "game/entity/creature/ICreature";
 import type Human from "game/entity/Human";
 import type { IEntityEvents, IProperties, IStatus, Property, StatusEffectChangeReason } from "game/entity/IEntity";
 import { DamageType, EntityType, MoveType, StatusType } from "game/entity/IEntity";
-import { Delay } from "game/entity/IHuman";
+import { Delay, MovingClientSide } from "game/entity/IHuman";
 import type { IStats } from "game/entity/IStats";
 import type NPC from "game/entity/npc/NPC";
 import type Player from "game/entity/player/Player";
@@ -30,14 +30,15 @@ import type { ITemperatureSource } from "game/temperature/ITemperature";
 import type { ITile } from "game/tile/ITerrain";
 import type { ISerializedTranslation } from "language/ITranslation";
 import type Translation from "language/Translation";
+import type { IRendererOrigin } from "renderer/context/RendererOrigin";
 import FieldOfView from "renderer/fieldOfView/FieldOfView";
 import type { CanASeeBType } from "renderer/fieldOfView/IFieldOfView";
-import type { ItemNotifierType, StatNotificationType } from "renderer/notifier/INotifier";
+import type { INotificationLocation, ItemNotifierType, StatNotificationType } from "renderer/notifier/INotifier";
 import { Direction } from "utilities/math/Direction";
 import type { IVector2, IVector3 } from "utilities/math/IVector";
 import Vector2 from "utilities/math/Vector2";
 import type { IVector4 } from "utilities/math/Vector4";
-export default abstract class Entity extends EventEmitter.Host<IEntityEvents> implements IReferenceable, IInspector, ITemperatureSource, IVector3 {
+export default abstract class Entity extends EventEmitter.Host<IEntityEvents> implements IReferenceable, IInspector, ITemperatureSource, INotificationLocation, IRendererOrigin, IVector3 {
     readonly stat: Stats<this>;
     entityType: EntityType;
     id: number;
@@ -47,13 +48,21 @@ export default abstract class Entity extends EventEmitter.Host<IEntityEvents> im
     x: number;
     y: number;
     /**
-     * Not guaranteed to be synced between the server and client for Player entities
+     * Not guaranteed to be synced between the server and client for Human entities
      */
     fromX: number;
     /**
-     * Not guaranteed to be synced between the server and client for Player entities
+     * Not guaranteed to be synced between the server and client for Human entities
      */
     fromY: number;
+    /**
+     * Not guaranteed to be synced between the server and client for Human entities
+     */
+    isMoving: boolean;
+    /**
+     * Only used for Human entities
+     */
+    movementCompleteZ: number | undefined;
     moveType: MoveType | undefined;
     anim: number;
     stopNextMovement: boolean;
@@ -65,7 +74,10 @@ export default abstract class Entity extends EventEmitter.Host<IEntityEvents> im
     islandId: IslandId;
     attackAnimationType: DamageType | undefined;
     attackAnimationTime: IMovementTime | undefined;
-    isMovingClientside: boolean;
+    /**
+     * The state of what the client thinks is happening to this entity (regarding movement)
+     */
+    movingClientside: MovingClientSide;
     allowSmartMovementClientside: boolean;
     protected _movementTime: {
         start: number;
@@ -118,9 +130,11 @@ export default abstract class Entity extends EventEmitter.Host<IEntityEvents> im
      * Faces the target and animates a bump into effect
      */
     animateBumpTowards(x: number, y: number): void;
+    protected setMoving(delay: Delay, fromX: number, fromY: number, toZ?: number): void;
     animateAttack(damageType: DamageType[] | undefined): void;
     getMovementPoint(timeStamp: number): IVector2;
     getMovementProgress(timeStamp: number): number;
+    protected onMovementCompleted(): void;
     getMoveType(): MoveType;
     setMoveType(moveType: MoveType): void;
     isInFov(): boolean;

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

@@ -65,7 +65,6 @@ export default abstract class Human extends Entity implements IHasInsulation {
     handEquippedToLast: EquipType.OffHand | EquipType.MainHand;
     inventory: IContainer;
     isConnecting: boolean;
-    movementCompleteZ: number | undefined;
     options: Readonly<IOptions>;
     islandId: IslandId;
     readonly equipEffects: Map<EquipEffect, EquipEffects>;
@@ -82,7 +81,6 @@ export default abstract class Human extends Entity implements IHasInsulation {
     walkSoundCounter: number;
     containerSortInfo: Record<string, IContainerSortInfo>;
     dialogContainerInfo: Record<number, IDialogInfo>;
-    isMoving: boolean;
     readonly movementIntent: IMovementIntent;
     walkPath: IWalkPath | undefined;
     identifier: string;
@@ -91,7 +89,6 @@ export default abstract class Human extends Entity implements IHasInsulation {
     messages: IMessageManager;
     notes: INoteManager;
     private readonly privateStore;
-    finishedMovingClientside: boolean;
     nextMoveTime: number;
     nextMoveDirection: Direction.Cardinal | Direction.None | undefined;
     private lastVehicleMoveDirection;
@@ -129,6 +126,7 @@ export default abstract class Human extends Entity implements IHasInsulation {
      */
     isServer(): boolean;
     isMultiplayerHost(): boolean;
+    protected onMovementCompleted(): void;
     moveTowardsIsland(direction: Direction.Cardinal | Direction.None, options?: Partial<IMoveToIslandOptions>): Promise<void>;
     moveToIslandPosition(position: IVector2, options?: Partial<IMoveToIslandOptions>): Promise<void>;
     /**

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

@@ -331,7 +331,8 @@ 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 {
@@ -418,6 +419,12 @@ export interface IVoyageInfo {
     usedItems?: Item[];
     wantedItems?: ItemType[];
 }
+export declare enum MovingClientSide {
+    NoInput = 0,
+    Moving = 1,
+    Moved = 2,
+    PreNoInput = 3
+}
 /**
  * The swimming skill required to travel to another island
  *

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

@@ -18,8 +18,7 @@ import type Human from "game/entity/Human";
 import type { AttackType, EntityType } from "game/entity/IEntity";
 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 { IPackedMessage } from "game/entity/player/IMessageManager";
 import type { TurnTypeFlag } from "game/entity/player/IPlayer";
 import type Player from "game/entity/player/Player";
 import type { Quality } from "game/IObject";
@@ -31,8 +30,6 @@ import type { IPromptDescriptionBase, PromptDescriptionArgs } from "game/meta/pr
 import type { Milestone } from "game/milestones/IMilestone";
 import type { ITile } from "game/tile/ITerrain";
 import type TileEvent from "game/tile/TileEvent";
-import type Message from "language/dictionary/Message";
-import type Translation from "language/Translation";
 import type { IRGB } from "utilities/Color";
 import type { Direction } from "utilities/math/Direction";
 import type { IVector2, IVector3 } from "utilities/math/IVector";
@@ -51,7 +48,7 @@ export declare enum ActionType {
     Sleep = 11,
     Heal = 12,
     Dig = 13,
-    Paddle = 14,
+    Ride = 14,
     GatherLiquid = 15,
     Cast = 16,
     Lockpick = 17,
@@ -145,11 +142,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,
@@ -175,22 +173,19 @@ export declare enum ActionDisplayLevel {
 }
 export interface IActionUsable {
     usable: true;
+    /**
+     * Whether this action is currently usable with the "use on move" feature. Defaults to `true`
+     */
+    usableOnMove?: boolean;
     displayLevel?: ActionDisplayLevel;
 }
-export interface IActionNotUsable {
+export interface IActionNotUsable extends Partial<IPackedMessage> {
     usable: false;
     alreadyUsing?: true;
     errorDisplayLevel?: ActionDisplayLevel;
-    message?: Message;
-    args?: Translation | any[];
+    mobCheck?: IVector3;
     arg?: never;
-    type?: MessageType;
-    sources?: Source | Source[];
     source?: never;
-    mobCheck?: IVector3;
-}
-export declare namespace IActionNotUsableUtilities {
-    function sendMessage(result: IActionNotUsable, human?: Human): void;
 }
 export declare type AnyActionDescription = IActionDescription<Array<ActionArgument | ActionArgument[]>, Entity, any, IActionUsable, any[]>;
 export interface IActionDescription<A extends Array<ActionArgument | ActionArgument[]> = Array<ActionArgument | ActionArgument[]>, E extends Entity = Entity, R = void, CU extends IActionUsable = IActionUsable, AV extends any[] = ActionArgumentTupleTypes<A>> {

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

@@ -25,12 +25,9 @@ import type Message from "language/dictionary/Message";
 import { ActionTranslation } from "language/dictionary/Misc";
 import TranslationImpl from "language/impl/TranslationImpl";
 import Translation from "language/Translation";
-import { PathType } from "resource/IResourceLoader";
 import type Bindable from "ui/input/Bindable";
 import type { ItemDetailIconLocation } from "ui/screen/screens/game/component/Item";
-import type Tooltip from "ui/tooltip/Tooltip";
 import type { HighlightSelector } from "ui/util/IHighlight";
-import ImagePath from "ui/util/ImagePath";
 export interface IUsableActionRequirement<TYPE> {
     allowNone?: true;
     validate?(player: Player, value: TYPE): boolean;
@@ -67,15 +64,17 @@ export interface IUsableActionUsing<REQUIREMENTS extends IUsableActionRequiremen
         validate(player: Player, value: Item): boolean;
     } ? Item : never) | (REQUIREMENTS["item"] extends {
         find(player: Player): Item;
-    } ? Item : never));
+    } ? 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 {
         allowNone: true;
     } ? undefined : never) | (REQUIREMENTS["item"] extends {
         validate(player: Player, value: Item): boolean;
-    } ? ItemType : never) | (REQUIREMENTS["item"] extends {
+    } ? ItemType | undefined : never) | (REQUIREMENTS["item"] extends {
         find(player: Player): Item;
     } ? ItemType : never) | (REQUIREMENTS["item"] extends {
-        allowOnlyItemType(player: Player): boolean;
+        allowOnlyItemType(player: Player, type: ItemType): boolean;
     } ? ItemType : never));
     doodad: ((REQUIREMENTS["doodad"] extends true ? Doodad : never) | (undefined extends REQUIREMENTS["doodad"] ? undefined : never) | (REQUIREMENTS["doodad"] extends {
         allowNone: true;
@@ -101,7 +100,7 @@ export interface IUsableActionUsing<REQUIREMENTS extends IUsableActionRequiremen
 }
 export declare type UsableActionIconReference = ActionType | UsableActionType | UsableActionTypePlaceholder | (Omit<IIcon, "path"> & {
     action: ActionType | UsableActionType | UsableActionTypePlaceholder;
-});
+}) | IIcon;
 export declare type ReturnableUsableActionUsability = IActionUsable | IActionNotUsable | boolean;
 export interface IUsableActionUsable<REQUIREMENTS extends IUsableActionRequirements> extends IActionUsable {
     using: IUsableActionUsing<REQUIREMENTS>;
@@ -142,7 +141,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.
      *
@@ -151,10 +150,6 @@ export interface IUsableActionDefinitionBase<REQUIREMENTS extends IUsableActionR
      * because it's repairing this tool.
      */
     iconLocationOnItem?: ItemDetailIconLocation;
-    /**
-     * The tooltip this action should have, or an initialiser for it.
-     */
-    tooltip?: ActionType | ((tooltip: Tooltip) => any);
     /**
      * A handler for what this action will highlight when hovered with the mouse.
      * @param selectors The default selectors. The defaults can be removed, and/or additional selectors can be added.
@@ -174,11 +169,14 @@ export interface IUsableActionDefinitionBase<REQUIREMENTS extends IUsableActionR
      */
     displayLevel?: ActionDisplayLevel;
     /**
-     * The display order of this action compared to other actions.
+     * Controls the display order of this action compared to other actions.
      * Generally you want to leave this as 0 (default) and just register your action in the correct place.
-     * Order can be generated dynamically based on the given objects — item, doodad, etc.
+     * Priority can be generated dynamically based on the given objects — item, doodad, etc.
+     *
+     * Higher priority === appears first.
+     * Lower priority === appears last.
      */
-    order?: number | ((using: IUsableActionPossibleUsing) => number | undefined);
+    priority?: number | ((using: IUsableActionPossibleUsing) => number | undefined);
     /**
      * Whether this action is currently usable — even if an action "makes sense" with the player and the objects they're using,
      * and the player can slot it and stuff, it might not currently be usable. For example, "harvest" having nothing to harvest.
@@ -261,14 +259,10 @@ 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(): {
-        path: ImagePath<PathType.Action>;
-        width: number;
-        height: number;
-    } | undefined;
+    getIcon(provided: IUsableActionPossibleUsing): IIcon | 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 +270,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,7 +18,7 @@ export interface IUsableActionDynamicDefinition {
     icon?: UsableActionIconReference;
     bindable: Bindable;
     displayLevel?: ActionDisplayLevel;
-    order?: number;
+    priority?: number;
 }
 export interface IUsableActionsDynamicConfig<DEFINITION extends IUsableActionDynamicDefinition, REQUIREMENTS extends IUsableActionRequirements> {
     id: string;
@@ -27,7 +27,7 @@ export interface IUsableActionsDynamicConfig<DEFINITION extends IUsableActionDyn
     requirements?(action: ActionType, definition?: DEFINITION): REQUIREMENTS;
     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;
+    priority?(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

@@ -13,29 +13,30 @@ declare const UsableActionsMain: UsableActionGenerator<[]>;
 export default UsableActionsMain;
 export declare enum UsableActionSet {
     /**
-     * A set of usable action that appear before all other actions, unless {@link IUsableActionDefinitionBase.order} causes them to appear even earlier.
-     * Note that `order` is used to sort "use item/doodad/npc" actions to the top — the actions that appear in {@link IItemDescription.use}.
+     * A set of usable action that appear before all other actions, unless {@link IUsableActionDefinitionBase.priority} causes them to appear even earlier.
+     * Note that `priority` 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;