@wayward/types 2.14.0-beta.dev.20240314.1 → 2.14.0-beta.dev.20240316.1

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

@@ -20,6 +20,7 @@ export interface IMoveItemFilterArgument {
     quality?: ArrayOr<Quality>;
     text?: string;
     excludeProtected?: boolean;
+    excludeEquipped?: boolean;
 }
 export declare class MoveItemFilterArgument<FILTER extends IMoveItemFilterArgument> extends ActionArgumentCustom<FILTER> {
     static canUse(filter: IMoveItemFilterArgument, item: Item, actionName?: Translation): IActionUsable | IActionNotUsable;

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

@@ -167,7 +167,8 @@ export type UsableActionUsability<REQUIREMENTS extends IUsableActionRequirements
 export declare enum UsableActionExecutionContext {
     Generic = 0,
     ContextMenu = 1,
-    ActionBar = 2
+    ActionBar = 2,
+    ActionBarAutoUse = 3
 }
 export interface IUsableActionExecutionContext {
     context: UsableActionExecutionContext;

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

@@ -11,7 +11,7 @@
 import type { Deity } from "@wayward/game/game/deity/Deity";
 import type Doodad from "@wayward/game/game/doodad/Doodad";
 import { ActionType } from "@wayward/game/game/entity/action/IAction";
-import type { ActionId, IUsableActionDefinition, IUsableActionDefinitionExecutable, IUsableActionExecutionContext, IUsableActionPossibleUsing, IUsableActionRequirements, IUsableActionUsing, UsableActionUsability } from "@wayward/game/game/entity/action/usable/IUsableAction";
+import type { ActionId, IUsableActionDefinition, IUsableActionDefinitionExecutable, IUsableActionExecutionContext, IUsableActionItemRequirement, IUsableActionPossibleUsing, IUsableActionRequirements, IUsableActionUsing, UsableActionUsability } from "@wayward/game/game/entity/action/usable/IUsableAction";
 import { IUsableActionNotUsable, UsableActionDisplayContext, UsableActionExecutionContext } from "@wayward/game/game/entity/action/usable/IUsableAction";
 import UsableActionRegistrar from "@wayward/game/game/entity/action/usable/UsableActionRegistrar";
 import type { ActionWhichTranslation } from "@wayward/game/game/entity/action/usable/UsableActionTranslator";
@@ -60,7 +60,7 @@ declare class UsableAction<REQUIREMENTS extends IUsableActionRequirements = IUsa
     resolveUsing(player: Player, using: IUsableActionUsing<REQUIREMENTS>): Message.UiActionCannotUseRequiresCreature | Message.UiActionCannotUseRequiresDoodad | Message.UiActionCannotUseRequiresItem | Message.UiActionCannotUseRequiresNPC | Message.UiActionCannotUseRequiresVehicle | IUsableActionUsing<REQUIREMENTS>;
     resolveUsingOrUndefined(player: Player, using: IUsableActionUsing<REQUIREMENTS>): IUsableActionUsing<REQUIREMENTS> | undefined;
     isUsable(player: Player, provided: IUsableActionUsing<REQUIREMENTS>, context: UsableActionExecutionContext | IUsableActionExecutionContext): UsableActionUsability<REQUIREMENTS>;
-    isApplicable(player: Player, provided?: IUsableActionPossibleUsing, fullUsabilityCheck?: boolean): provided is IUsableActionUsing<REQUIREMENTS>;
+    isApplicable(player: Player, provided?: IUsableActionPossibleUsing, fullUsabilityCheck?: boolean, requireItem?: boolean): provided is IUsableActionUsing<REQUIREMENTS>;
     private isItemApplicable;
     private isDoodadApplicable;
     private isCreatureApplicable;
@@ -82,6 +82,11 @@ declare class UsableAction<REQUIREMENTS extends IUsableActionRequirements = IUsa
     getHighlightSelectors(using?: IUsableActionPossibleUsing): Array<HighlightSelector | undefined>;
     private translator?;
     getTranslation(using?: IUsableActionPossibleUsing, which?: ActionWhichTranslation, context?: UsableActionDisplayContext): Translation | undefined;
+    /**
+     * Determines whether this action is an item action, using `requirements.item`
+     */
+    isItemAction(predicate?: (requirements: IUsableActionItemRequirement) => any): boolean;
+    get itemRequirementObject(): IUsableActionItemRequirement | undefined;
     getOrder(using?: IUsableActionPossibleUsing): number;
     getContextualLevel(using?: IUsableActionPossibleUsing): number;
     canUseOnMoveWhenDiscovered(): boolean;

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

@@ -18,7 +18,7 @@ import type { TranslationArg } from "@wayward/game/language/ITranslation";
 import Translation from "@wayward/game/language/Translation";
 import type { IActionUseContextUsing } from "@wayward/game/ui/screen/screens/game/static/actions/IActionBar";
 export type UsableActionTranslationArguments = [using: IActionUseContextUsing, action: UsableAction, context: UsableActionDisplayContext, inspectionContext?: InfoProviderContext];
-export type ActionWhichTranslation = ActionTranslation | "useExact" | "useBest" | "useNone";
+export type ActionWhichTranslation = ActionTranslation | "useExact" | "useBest" | "useNone" | "useHovered";
 export declare class UsableActionTranslator {
     readonly id: ActionId;
     static translateId(id: ActionId, which?: ActionTranslation): TranslationImpl | undefined;
@@ -27,6 +27,7 @@ export declare class UsableActionTranslator {
     private useExactSupplier?;
     private useBestSupplier?;
     private useNoneSupplier?;
+    private useHoveredSupplier?;
     private readonly args;
     private internalAction?;
     constructor(id: ActionId);
@@ -39,5 +40,6 @@ export declare class UsableActionTranslator {
     useExact(supplier: SupplierOr<Translation, UsableActionTranslationArguments>): this;
     useBest(supplier: SupplierOr<Translation, UsableActionTranslationArguments>): this;
     useNone(supplier: SupplierOr<Translation, UsableActionTranslationArguments>): this;
+    useHovered(supplier: SupplierOr<Translation, UsableActionTranslationArguments>): this;
     get(action: UsableAction, using?: IUsableActionPossibleUsing, which?: ActionWhichTranslation, context?: UsableActionDisplayContext, inspectionContext?: InfoProviderContext): Translation | undefined;
 }

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

@@ -21,7 +21,7 @@ export declare enum ShipperNPCInteractType {
 export declare const MERCHANT_MAX_TRADES = 6;
 export declare const MERCHANT_SELL_PRICE_MULTIPLIER = 1.5;
 export declare const MERCHANT_ALREADY_TRADED_MULTIPLIER = 1.1;
-export declare const NPC_SPAWN_CHANCE_MERCHANT_CIV_SCORE_MULTIPLIER = 0.0001;
+export declare const NPC_SPAWN_CHANCE_MERCHANT_CIV_SCORE_MULTIPLIER = 0.001;
 export declare const NPC_SPAWN_CHANCE_SHIPPER_CIV_SCORE_MULTIPLIER = 0.00005;
 export declare const NPC_SPAWN_CHANCE_MERCHANT_DISTANCE_PENALTY_MULTIPLIER = 0.1;
 export declare const NPC_SPAWN_CHANCE_SHIPPER_DISTANCE_BONUS_MULTIPLIER = 0.05;