@wayward/types 2.12.0-beta.dev.20220829.1 → 2.12.0-beta.dev.20220901.1

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/creature/Creature.d.ts

@@ -40,7 +40,7 @@ export default class Creature extends Entity implements IUnserializedCallback, I
         attacks: number;
         attempts: number;
     };
-    respawned?: boolean;
+    respawned?: number;
     shouldSkipNextUpdate: boolean;
     type: CreatureType;
     originalMoveType: MoveType | undefined;

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

@@ -150,7 +150,6 @@ export interface ICreatureDescription extends IModdable, ITemperatureDescription
     lootGroup?: LootGroupType;
     jumpOver?: boolean;
     noCorpse?: boolean;
-    respawn?: boolean;
     reputation: number;
     waterAnimations?: boolean;
     tamingDifficulty?: number;

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

@@ -9,6 +9,7 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import EventEmitter from "event/EventEmitter";
+import type { ICorpseDescription } from "game/entity/creature/corpse/ICorpse";
 import { CreatureType } from "game/entity/creature/ICreature";
 import type { CreationId } from "game/IGame";
 import type { IObject } from "game/IObject";
@@ -20,7 +21,19 @@ import type { ISerializedTranslation } from "language/ITranslation";
 import type Translation from "language/Translation";
 import type { IVector3 } from "utilities/math/IVector";
 export interface ICorpseEvents {
+    /**
+     * Called when the entity is created in the game
+     * Also called for players that "rejoin" the game
+     */
+    created(): void;
+    /**
+     * Called when the entity is removed from the game
+     */
+    removed(): void;
 }
+/**
+ * TODO: extends Entity?
+ */
 export default class Corpse extends EventEmitter.Host<ICorpseEvents> implements IObject<CreatureType>, IVector3, IReferenceable {
     static is(value: any): value is Corpse;
     readonly objectType: CreationId.Corpse;
@@ -32,11 +45,13 @@ export default class Corpse extends EventEmitter.Host<ICorpseEvents> implements
     referenceId?: number;
     renamed?: string | ISerializedTranslation | undefined;
     step?: number | undefined;
+    respawned?: number;
     type: CreatureType;
     x: number;
     y: number;
     z: number;
     islandId: IslandId;
+    private _description;
     constructor(type?: CreatureType, islandId?: `${number},${number}`, x?: number, y?: number, z?: number, decay?: number);
     get island(): import("../../../island/Island").default;
     toString(): string;
@@ -50,9 +65,17 @@ export default class Corpse extends EventEmitter.Host<ICorpseEvents> implements
      * - `corpse.getName(undefined, 3)` // "acid spitter demons"
      */
     getName(article?: false | "definite" | "indefinite", count?: number): Translation;
+    description(): ICorpseDescription | undefined;
     getTile(): ITile;
     isValid(): boolean;
     getDecayAtStart(): number;
     update(): void;
     getResources(clientSide?: boolean): ItemType[];
+    protected onCreated(): void;
+    protected onRemoved(): void;
+    /**
+     * Updates the DoodadOverHidden tile flag if the creature is large.
+     * Large creatures should render over the doodad over layer, which means we should hide the doodad over layer for doodads on the creatures tile.
+     */
+    updateDoodadOverHiddenState(shouldBeHidden: boolean): void;
 }

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

@@ -21,7 +21,7 @@ export interface ICorpseManagerEvents {
 export default class CorpseManager extends ObjectManager<Corpse, ICorpseManagerEvents> {
     protected readonly creationId: CreationId;
     load(): void;
-    create(type: CreatureType, x: number, y: number, z: number, decay?: number, aberrant?: boolean, name?: string, qualityBonus?: number): Corpse | undefined;
+    create(type: CreatureType, x: number, y: number, z: number, decay?: number, aberrant?: boolean, name?: string, qualityBonus?: number, respawned?: number): Corpse | undefined;
     updateAll(): void;
     remove(corpse: Corpse): void;
     getName(typeOrCorpse: CreatureType | Corpse, article?: false | "definite" | "indefinite", count?: number, showCount?: boolean): import("../../../../language/impl/TranslationImpl").default;

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

@@ -23,6 +23,8 @@ export interface ICorpseDescription extends IModdable {
     lightColor?: IRGB;
     animated?: boolean;
     isFlammable?: boolean;
+    isTall?: boolean;
+    respawns?: boolean;
 }
 export interface ICorpseResourceDrop {
     item: ItemType;

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

@@ -38,6 +38,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 +55,6 @@ export default class MerchantNPC extends NPC {
      */
     private processThirst;
     get asMerchant(): MerchantNPC;
+    private calculateWeaponEquipItemScore;
+    private calculateDefenseEquipItemScore;
 }

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

@@ -68,6 +68,7 @@ export declare const SYMBOL_CONTAINER_ITEMS_TEMPERATURE: unique symbol;
 export declare const SYMBOL_CONTAINER_TILE_TEMPERATURE: unique symbol;
 export interface IContainable {
     containedWithin?: IContainer;
+    containerType?: ContainerType;
     [SYMBOL_CONTAINER_CACHED_REFERENCE]?: ContainerReference;
 }
 export interface IContainer extends IContainable {
@@ -77,7 +78,6 @@ export interface IContainer extends IContainable {
     containedItems: Item[];
     transientItems?: Item[];
     itemOrders?: number[];
-    containerType?: ContainerType;
 }
 export interface IItemDisassembleResult {
     items: IItemDisassembly[];

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

@@ -183,8 +183,8 @@ export default class Item extends EventEmitter.Host<IItemEvents> implements IRef
     getDamageModifier(): number;
     isDamaged(): boolean;
     isInTradeContainer(): boolean;
+    getEquippedHuman(): Human | undefined;
     isEquipped(includeDisabled?: true): boolean;
-    getEquippedPlayer(): Human | undefined;
     getEquipSlot(includeDisabled?: true): EquipType | undefined;
     isDecayed(): boolean;
     changeInto(type: ItemType, disableNotify?: boolean, emitTransformation?: boolean): void;

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

@@ -234,6 +234,11 @@ export default class ItemManager extends ObjectManager<Item, IItemManagerEvents>
      * @returns whether the given containable is, or is contained within, the given container
      */
     isContainableInContainer(containable: IContainable, container: IContainer): boolean;
+    /**
+     * @returns whether the given containable is, or is contained within, a trade container
+     */
+    isContainableInTradeContainer(containable: IContainable): boolean;
+    getTradeContainerForContainer(containable: IContainer | undefined): IContainer | undefined;
     getAdjacentContainers(humanOrPosition: Human | IVector3, includeNpcs?: boolean, ignoreOptions?: boolean): IContainer[];
     isContainableInAdjacentContainer(human: Human, containable: IContainable, includeNpcs?: boolean, ignoreOptions?: boolean): boolean;
     isInInventory(containable: IContainable): boolean;
@@ -298,7 +303,7 @@ export default class ItemManager extends ObjectManager<Item, IItemManagerEvents>
      */
     loadReference(container: IContainer, loadChildReferences?: boolean): boolean;
     private removeFromContainerInternal;
-    private updateUiOnItemRemove;
+    private onItemMoveOrRemove;
     private getCraftTierBonus;
     computeCraftQualityBonus(itemType: ItemType, itemsToRequire: Item[], itemsToConsume: Item[], doodadsUsed: IDoodadsUsed[] | undefined): number;
     getCraftChance(human: Human, recipe: IRecipe, qualityBonus: number, returnQuality?: boolean, alwaysReturn?: boolean): number;

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

@@ -195,7 +195,8 @@ export declare enum TileTemplateType {
     IceHouses = 9,
     SnowHouses = 10,
     AshCementHouses = 11,
-    StoneHouses = 12
+    StoneHouses = 12,
+    Railways = 13
 }
 export interface ITemplate {
     mapTile?: MapTile;

package/definitions/game/renderer/world/WorldRenderer.d.ts

@@ -221,6 +221,7 @@ export default class WorldRenderer extends EventEmitter.Host<IWorldRendererEvent
      */
     private renderStatusEffect;
     private spriteBatchForLayer;
+    addTileToViewport(visibleTiles: Set<ITile>, x: number, y: number, itemBatch: ISpriteBatch | undefined): void;
     computeSpritesInViewportImmediately(): void;
     private batchItems;
     private batchItem;

package/definitions/game/ui/input/IIInput.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 { InputCatalyst } from "ui/input/IInput";
+import type { InputCatalyst, Modifier } from "ui/input/IInput";
 export declare enum InputCatalystType {
     Key = 0,
     MouseButton = 1,
@@ -21,8 +21,11 @@ export declare enum InputIcon {
     ClickRight = 2,
     ScrollUp = 3,
     ScrollDown = 4,
-    HoverItem = 5
+    HoverItem = 5,
+    Shift = 6,
+    Ctrl = 7,
+    Alt = 8
 }
 export declare namespace InputIcon {
-    function get(catalyst: InputCatalyst): InputIcon | undefined;
+    function get(catalyst: InputCatalyst | Modifier): InputIcon | undefined;
 }

package/definitions/game/ui/input/IInput.d.ts

@@ -49,7 +49,7 @@ declare enum ModifierType {
 export declare type Modifier = keyof typeof ModifierType;
 export declare module Modifier {
     function is(value: unknown): value is Modifier;
-    function translate(modifier: Modifier): TranslationImpl;
+    function translate(modifier: Modifier, simplify?: boolean): TranslationImpl;
     function getTranslationId(modifier: Modifier): string;
     function setsEqual(modifiersA: Set<Modifier>, modifiersB: Set<Modifier>): boolean;
     function all(): readonly Modifier[];

package/definitions/game/ui/old/screens/InGameScreen.d.ts

@@ -127,7 +127,7 @@ export default class InGameScreen extends BaseScreen {
     onAddItemsToContainer(containerElement: JQuery, containerDialogElement: JQuery | undefined, isInventoryContainer: boolean, updateTables?: boolean): void;
     afterAddingMultipleItemsToContainer(container: IContainer): void;
     removeItemFromContainer(item: Item, container: IContainer): void;
-    refreshContainerName(container: IContainer): void;
+    refreshContainerName(container: IContainer, nestedUpdate?: boolean): void;
     getInventoryItemsInOrder(): any[];
     saveItemOrder(containerElement: JQuery, activeSort?: boolean): void;
     craftItem(itemType: ItemType): void;
@@ -169,7 +169,7 @@ export default class InGameScreen extends BaseScreen {
     closeStaticContainers(): void;
     hasOpenContainer(): boolean;
     closeAllContainers(closeType?: "close" | "destroy"): boolean;
-    updateContainerName(containerDialogElement: JQuery): void;
+    updateContainerName(containerDialogElement: JQuery, nestedUpdate?: boolean): void;
     updateActiveContainer(): void;
     getActiveContainer(): IUiContainer | undefined;
     getOpenContainers(): IUiContainer[];

package/definitions/game/ui/screen/screens/game/Dialogs.d.ts

@@ -42,9 +42,14 @@ export declare type IEdges = [
     ]
 ];
 export interface IDialogDescription<SQUARE = boolean> extends IModdable {
-    minSize: SQUARE extends true ? number : IVector2;
+    /**
+     * The minimum resolution of this dialog, in pixels.
+     */
+    minResolution: SQUARE extends true ? number : IVector2;
+    /**
+     * The default size of this dialog, in percentages. For square dialogs, this is the Y axis.
+     */
     size: SQUARE extends true ? number : IVector2;
-    maxSize: SQUARE extends true ? number : IVector2;
     edges: IEdges | "center";
     /**
      * Whether to save if the dialog is open. If this is false, the dialog will always be closed when a game loads. Defaults to true.

package/definitions/game/ui/screen/screens/game/static/ActionBar.d.ts

@@ -26,7 +26,7 @@ import QuadrantComponent from "ui/screen/screens/game/component/QuadrantComponen
 import ActionsConfigurationDrawer from "ui/screen/screens/game/static/actions/ActionsDrawer";
 import ActionSlotTooltipHandler from "ui/screen/screens/game/static/actions/ActionSlotTooltip";
 import { IActionBarSlotData } from "ui/screen/screens/game/static/actions/IActionBar";
-export declare const MAX_SLOTS = 50;
+export declare const MAX_SLOTS = 48;
 export declare enum ActionBarClasses {
     Main = "game-action-bar",
     Configuring = "game-action-bar-configuring",
@@ -107,7 +107,7 @@ export declare class ActionSlot extends Button implements IRefreshable {
     clear(): void;
     equipItem(item: Item, configure?: boolean): void;
     protected onConfigureBind(api: IBindHandlerApi): boolean;
-    configure(): void;
+    configure(emitToActionBar?: boolean): void;
     protected onAppend(): void;
     protected onItemMaybeInaccessible(): void;
     postExecuteAction(action: IActionApi): void;

package/definitions/game/ui/screen/screens/game/static/actions/ActionBarBindableManager.d.ts

@@ -19,5 +19,5 @@ export default class ActionBarBindableManager extends BindableManager {
     getSlotToggleBindable(slot: number): Bindable | undefined;
     requireSlots(slotCount: number): void;
     private generateBindings;
-    private generateCatalyst;
+    private generateBinding;
 }

package/definitions/game/ui/screen/screens/menu/menus/LoadGameMenu.d.ts

@@ -19,7 +19,7 @@ export default class LoadGameMenu extends Menu {
     private sort;
     private sortDirection;
     private newGameButton;
-    private readonly milestonesNotUnlockableWarning;
+    private milestonesNotUnlockableWarning;
     private readonly selectedRow;
     constructor();
     protected onSelect(api: IBindHandlerApi): boolean;

package/package.json

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