@wayward/types 2.13.3-beta.dev.20230617.1 → 2.13.3-beta.dev.20230618.2

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

@@ -475,7 +475,7 @@ export interface IHasBuilder {
     getBuilder(): Human | undefined;
 }
 export interface IHasWater {
-    top?: boolean;
-    bottom?: boolean;
+    top?: true;
+    bottom?: true;
 }
 export {};

package/definitions/game/game/entity/player/note/NoteManager.d.ts

@@ -15,7 +15,7 @@ import type { TranslationArg } from "language/ITranslation";
 import Translation from "language/Translation";
 import Note from "language/dictionary/Note";
 import type { IModdable } from "mod/ModRegistry";
-import { HelpArticle } from "ui/screen/screens/menu/menus/help/HelpArticleDescriptions";
+import { HelpArticle } from "ui/screen/screens/menu/menus/help/IHelpArticle";
 export interface INoteDescription extends IModdable {
     learnMore?: HelpArticle;
 }

package/definitions/game/game/inspection/infoProviders/creature/CreatureTamedInfo.d.ts

@@ -22,6 +22,6 @@ export default class CreatureTamedInfoProvider extends InfoProvider {
     constructor(creature: Creature);
     getClass(): string[];
     hasContent(): boolean;
-    get(): (import("game/inspection/InfoProvider").SimpleInfoProvider | LabelledValue)[];
+    get(): (LabelledValue | import("game/inspection/InfoProvider").SimpleInfoProvider)[];
     private getHappinessMessage;
 }

package/definitions/game/game/inspection/infoProviders/item/ItemDetails.d.ts

@@ -19,7 +19,7 @@ export default class ItemDetailsInfoProvider extends InfoProvider {
     private readonly description;
     constructor(item: Item | ItemType);
     getClass(): string[];
-    get(): (0 | import("game/inspection/InfoProvider").SimpleInfoProvider | LabelledValue | ItemWorthInfoProvider)[];
+    get(): (0 | LabelledValue | import("game/inspection/InfoProvider").SimpleInfoProvider | ItemWorthInfoProvider)[];
     private getInsulation;
     private getPreservation;
     private getGroupings;

package/definitions/game/game/inspection/infoProviders/stat/AttackInfo.d.ts

@@ -12,7 +12,7 @@ import LabelledValue from "game/inspection/infoProviders/LabelledValue";
 import { StatInfo } from "game/inspection/infoProviders/stat/StatInfo";
 export default class AttackInfo extends StatInfo {
     getClass(): string[];
-    get(): (import("game/inspection/InfoProvider").SimpleInfoProvider | LabelledValue)[];
+    get(): (LabelledValue | import("game/inspection/InfoProvider").SimpleInfoProvider)[];
     private getTactics;
     private getMainHand;
     private getOffHand;

package/definitions/game/game/inspection/infoProviders/stat/FerocityInfo.d.ts

@@ -24,5 +24,5 @@ export default class FerocityInfo extends StatInfo {
     readonly ticks: InfoProvider.Observer<number>;
     getTitle(stat: Stat): SimpleInfoProvider;
     getClass(): string[];
-    get(): (SimpleInfoProvider | LabelledValue)[];
+    get(): (LabelledValue | SimpleInfoProvider)[];
 }

package/definitions/game/game/inspection/inspections/CorpseInspection.d.ts

@@ -19,7 +19,7 @@ export default class CorpseInspection extends Inspection<Corpse> {
     static getFromTile(tile: Tile): CorpseInspection[];
     static handles(type: InspectType, corpse: unknown): boolean;
     constructor(corpse: Corpse);
-    get(context: InfoProviderContext): (0 | import("game/inspection/InfoProvider").SimpleInfoProvider | LabelledValue)[];
+    get(context: InfoProviderContext): (0 | LabelledValue | import("game/inspection/InfoProvider").SimpleInfoProvider)[];
     private getDecay;
     private decay;
     private shouldRefreshDecay;

package/definitions/game/game/island/IIsland.d.ts

@@ -96,6 +96,12 @@ export interface IIslandEvents {
     portsChanged(addedPort?: Port, removedPort?: Port): any;
     getDefense(defense: Defense | undefined, target: Human | Creature | CreatureType, damageType?: DamageType): Defense | undefined;
     calculateAttackOutcome(damageOutcome: IDamageOutcome, input: IDamageOutcomeInput, attackValue: number, defenseValue: number): IDamageOutcome | undefined;
+    /**
+     * Called when determining how many ticks to process when fast forwarding an island during traveling
+     * @param fastForwardAmount Fast forward amount
+     * @param travelTime Travel time
+     */
+    getFastForwardAmount(fastForwardAmount: number, travelTime: number): number | undefined;
 }
 export interface ILegacySeeds {
     type: SeedType.Legacy;

package/definitions/game/game/island/Island.d.ts

@@ -200,9 +200,9 @@ export default class Island extends EventEmitter.Host<IIslandEvents> implements
     getTileFromPoint(point: IVector3): Tile;
     getTile(x: number, y: number, z: number, disableLog?: boolean): Tile;
     getTileSafe(x: number, y: number, z: number): Tile | undefined;
-    createTile(x: number, y: number, z: number, index: number): Tile;
+    createTile(x: number, y: number, z: number, index: number, rendererData: number, quality: Quality): Tile;
     setTile(x: number, y: number, z: number, tile: Tile): Tile;
-    getOrCreateTile(index: number, x: number, y: number, z: number): Tile;
+    getOrCreateTile(index: number, x: number, y: number, z: number, rendererData: number, quality: Quality): Tile;
     updateFlowFieldTile(tile: Tile, tileUpdateType: TileUpdateType, updatedRenderer?: boolean): void;
     /**
      * Checks if island.tileData is synced with Tile.data

package/definitions/game/game/meta/prompt/PromptDescriptions.d.ts

@@ -14,7 +14,7 @@ import type { ISerializedTranslation } from "language/ITranslation";
 import type Translation from "language/Translation";
 import type Bindable from "ui/input/Bindable";
 import { MenuId } from "ui/screen/screens/menu/component/IMenu";
-import type { HelpArticle } from "ui/screen/screens/menu/menus/help/HelpArticleDescriptions";
+import type { HelpArticle } from "ui/screen/screens/menu/menus/help/IHelpArticle";
 type Text = Translation | ISerializedTranslation | string;
 export declare const promptGameDialogMessagesEditFiltersSaveOverExisting: import("game/meta/prompt/IPrompt").IPromptConfirmDescription<[]>;
 export declare const promptGameDialogMessagesEditFiltersResetConfirm: import("game/meta/prompt/IPrompt").IPromptConfirmDescription<[]>;

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

@@ -54,11 +54,6 @@ export default class Tile implements IVector4, Partial<ITileContainer>, IFieldOf
     readonly x: number;
     readonly y: number;
     readonly z: WorldZ;
-    /**
-     * Data associated with the tile
-     */
-    rendererData: number;
-    quality?: Quality;
     /**
      * Entities on the tile
      */
@@ -78,25 +73,30 @@ export default class Tile implements IVector4, Partial<ITileContainer>, IFieldOf
      */
     containedItems?: Item[];
     private _description;
+    /**
+     * Data associated with the tile
+     */
+    private _rendererData;
+    /**
+     * Tile quality that is linked to map gen / tileData
+     */
+    private _quality?;
     /**
      * Creates a fake tile
      */
-    static createFake(island: Island): Tile;
+    static createFake(island: Island, x?: number, y?: number, z?: number): Tile;
     /**
      * Constructed during map gen
      */
-    constructor(island: Island, x: number, y: number, z: number, id: number);
+    constructor(island: Island, x: number, y: number, z: number, id: number, rendererData: number, quality: Quality);
     get point(): IVector3;
     get description(): ITerrainDescription | undefined;
     toString(): string;
     getName(includeCoordinates?: boolean): Translation;
     get type(): TerrainType;
-    /**
-     * Use game.changeTile or game.removeTopTile when modifying tiles.
-     * This should only be called if you know what you're doing.
-     * Otherwise the game state could get out of sync.
-     */
-    set type(value: number);
+    private set type(value);
+    get quality(): Quality;
+    private set quality(value);
     get isTilled(): boolean;
     /**
      * This should only be called if you know what you're doing
@@ -181,6 +181,15 @@ export default class Tile implements IVector4, Partial<ITileContainer>, IFieldOf
     };
     getTileData(): ITileData[] | undefined;
     getOrCreateTileData(): ITileData[];
+    /**
+     * Use game.changeTile or game.removeTopTile when modifying tiles.
+     * This should only be called if you know what you're doing.
+     * Otherwise the game state could get out of sync.
+     */
+    forceChangeTile(type: TerrainType, quality: Quality): void;
+    /**
+     * Changes the tile
+     */
     changeTile(newTileInfo: TerrainType | ITileData, stackTiles: boolean, dropTiles?: boolean): void;
     /**
      * Removes the top tiledata (index 0) from the tile

package/definitions/game/language/DictionaryMap.d.ts

@@ -81,7 +81,7 @@ import { SkillSort } from "ui/screen/screens/game/dialog/ISkillsDialog";
 import { ActionSort } from "ui/screen/screens/game/static/actions/IActionsDrawer";
 import { MenuBarButtonType } from "ui/screen/screens/game/static/menubar/IMenuBarButton";
 import { CharacterSort } from "ui/screen/screens/menu/menus/character/Character";
-import { HelpArticle } from "ui/screen/screens/menu/menus/help/HelpArticleDescriptions";
+import { HelpArticle } from "ui/screen/screens/menu/menus/help/IHelpArticle";
 import { HighscoreSort } from "ui/screen/screens/menu/menus/highscores/IHighscoresMenu";
 import { Responsibility } from "ui/screen/screens/menu/menus/main/IAbout";
 import { Website } from "ui/screen/screens/menu/menus/main/component/IWebsite";

package/definitions/game/language/dictionary/Misc.d.ts

@@ -105,43 +105,45 @@ export declare enum MiscTranslation {
     AListOrB = 3,
     AOrB = 4,
     Binding = 5,
-    BindingListSeparator = 6,
-    BindingWhenHoveringItem = 7,
-    Classes = 8,
-    Colorize = 9,
-    ColorizeDamage = 10,
-    ColorizeMagical = 11,
-    ColorizeMessageType = 12,
-    ColorizePrimary = 13,
-    ColorizeQuality = 14,
-    ColorizeSecondary = 15,
-    ColorizeStat = 16,
-    ColorizeVulnerability = 17,
-    CorpseOf = 18,
-    CountThing = 19,
-    CreatureSubtitle = 20,
-    Dependency = 21,
-    Difference = 22,
-    EquipSlotEquipToYour = 23,
-    ExpressionSeparator = 24,
-    ItemMagicalProperty = 25,
-    ListItemSeparator = 26,
-    Merge = 27,
-    MergeSpaced = 28,
-    Multiply = 29,
-    NPCName = 30,
-    NPCNameUnmet = 31,
-    NumberSingleDecimal = 32,
-    OwnName = 33,
-    Percent = 34,
-    PercentRaw = 35,
-    PlayerName = 36,
-    Possession = 37,
-    Range = 38,
-    ReformatSingularNoun = 39,
-    Renamed = 40,
-    Tile = 41,
-    Tilled = 42,
-    Unknown = 43,
-    UnknownItem = 44
+    BindingInputModifierSeparator = 6,
+    BindingListSeparator = 7,
+    BindingMacroSeparator = 8,
+    BindingWhenHoveringItem = 9,
+    Classes = 10,
+    Colorize = 11,
+    ColorizeDamage = 12,
+    ColorizeMagical = 13,
+    ColorizeMessageType = 14,
+    ColorizePrimary = 15,
+    ColorizeQuality = 16,
+    ColorizeSecondary = 17,
+    ColorizeStat = 18,
+    ColorizeVulnerability = 19,
+    CorpseOf = 20,
+    CountThing = 21,
+    CreatureSubtitle = 22,
+    Dependency = 23,
+    Difference = 24,
+    EquipSlotEquipToYour = 25,
+    ExpressionSeparator = 26,
+    ItemMagicalProperty = 27,
+    ListItemSeparator = 28,
+    Merge = 29,
+    MergeSpaced = 30,
+    Multiply = 31,
+    NPCName = 32,
+    NPCNameUnmet = 33,
+    NumberSingleDecimal = 34,
+    OwnName = 35,
+    Percent = 36,
+    PercentRaw = 37,
+    PlayerName = 38,
+    Possession = 39,
+    Range = 40,
+    ReformatSingularNoun = 41,
+    Renamed = 42,
+    Tile = 43,
+    Tilled = 44,
+    Unknown = 45,
+    UnknownItem = 46
 }

package/definitions/game/language/dictionary/UiTranslation.d.ts

@@ -822,49 +822,51 @@ declare enum UiTranslation {
     MiscError = 807,
     MiscContextMenuCopyTooltip = 808,
     MiscBindableNoBindings = 809,
-    DifficultyOptionsPeaceful = 810,
-    DifficultyOptionsAberrantSpawnsDisabled = 811,
-    DifficultyOptionsAberrantSpawnsOnly = 812,
-    DifficultyOptionsCreatureSpawningDisabled = 813,
-    DifficultyOptionsCreatureAlwaysSpawns = 814,
-    DifficultyOptionsCreatureSpawnsDefault = 815,
-    DifficultyOptionsCreatureSpawnsAberrantOnly = 816,
-    DifficultyOptionsCreatureSpawnsNoAberrants = 817,
-    DifficultyOptionsSpawnLimit = 818,
-    DifficultyOptionsRespawn = 819,
-    DifficultyOptionsEternalNight = 820,
-    DifficultyOptionsEternalDay = 821,
-    DifficultyOptionsTimeInitial = 822,
-    DifficultyOptionsTimeFrozen = 823,
-    DifficultyOptionsTimeDayLength = 824,
-    DifficultyOptionsTimeDayPercent = 825,
-    DifficultyOptionsNoItems = 826,
-    DifficultyOptionsRecipes = 827,
-    DifficultyOptionsStartingIsland = 828,
-    DifficultyOptionsTravelingEffectsDisabled = 829,
-    DifficultyOptionsBenignityInitial = 830,
-    DifficultyOptionsBenignityMultiplier = 831,
-    DifficultyOptionsMalignityInitial = 832,
-    DifficultyOptionsMalignityMultiplier = 833,
-    DifficultyOptionsWeightBonus = 834,
-    DifficultyOptionsStatInitial = 835,
-    DifficultyOptionsStatMax = 836,
-    DifficultyOptionsStatMultiplier = 837,
-    DifficultyOptionsStatusEffectStartWith = 838,
-    DifficultyOptionsStatusEffectUntreatable = 839,
-    DifficultyOptionsStatusEffectPassChanceMultiplier = 840,
-    DifficultyOptionsNoRandomSkills = 841,
-    DifficultyOptionsSkillStartingCount = 842,
-    DifficultyOptionsSkillGainMultiplier = 843,
-    DifficultyOptionsSkillInitial = 844,
-    DifficultyOptionsStatusEffectPermanent = 845,
-    DifficultyOptionsStatusEffectRateMultiplier = 846,
-    DifficultyOptionsStatusEffectMultiplier = 847,
-    DifficultyOptionsItemDurabilityMultiplier = 848,
-    DifficultyOptionsItemDecayMultiplier = 849,
-    TabCrafting = 850,
-    TabDismantle = 851,
-    WindowTitleContainer = 852,
-    WindowTitleInventory = 853
+    MiscBindingIcon = 810,
+    MiscBindingIconThen = 811,
+    DifficultyOptionsPeaceful = 812,
+    DifficultyOptionsAberrantSpawnsDisabled = 813,
+    DifficultyOptionsAberrantSpawnsOnly = 814,
+    DifficultyOptionsCreatureSpawningDisabled = 815,
+    DifficultyOptionsCreatureAlwaysSpawns = 816,
+    DifficultyOptionsCreatureSpawnsDefault = 817,
+    DifficultyOptionsCreatureSpawnsAberrantOnly = 818,
+    DifficultyOptionsCreatureSpawnsNoAberrants = 819,
+    DifficultyOptionsSpawnLimit = 820,
+    DifficultyOptionsRespawn = 821,
+    DifficultyOptionsEternalNight = 822,
+    DifficultyOptionsEternalDay = 823,
+    DifficultyOptionsTimeInitial = 824,
+    DifficultyOptionsTimeFrozen = 825,
+    DifficultyOptionsTimeDayLength = 826,
+    DifficultyOptionsTimeDayPercent = 827,
+    DifficultyOptionsNoItems = 828,
+    DifficultyOptionsRecipes = 829,
+    DifficultyOptionsStartingIsland = 830,
+    DifficultyOptionsTravelingEffectsDisabled = 831,
+    DifficultyOptionsBenignityInitial = 832,
+    DifficultyOptionsBenignityMultiplier = 833,
+    DifficultyOptionsMalignityInitial = 834,
+    DifficultyOptionsMalignityMultiplier = 835,
+    DifficultyOptionsWeightBonus = 836,
+    DifficultyOptionsStatInitial = 837,
+    DifficultyOptionsStatMax = 838,
+    DifficultyOptionsStatMultiplier = 839,
+    DifficultyOptionsStatusEffectStartWith = 840,
+    DifficultyOptionsStatusEffectUntreatable = 841,
+    DifficultyOptionsStatusEffectPassChanceMultiplier = 842,
+    DifficultyOptionsNoRandomSkills = 843,
+    DifficultyOptionsSkillStartingCount = 844,
+    DifficultyOptionsSkillGainMultiplier = 845,
+    DifficultyOptionsSkillInitial = 846,
+    DifficultyOptionsStatusEffectPermanent = 847,
+    DifficultyOptionsStatusEffectRateMultiplier = 848,
+    DifficultyOptionsStatusEffectMultiplier = 849,
+    DifficultyOptionsItemDurabilityMultiplier = 850,
+    DifficultyOptionsItemDecayMultiplier = 851,
+    TabCrafting = 852,
+    TabDismantle = 853,
+    WindowTitleContainer = 854,
+    WindowTitleInventory = 855
 }
 export default UiTranslation;

package/definitions/game/language/english/ui/HelpArticles.d.ts

@@ -8,6 +8,6 @@
  * 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 { HelpArticle } from "ui/screen/screens/menu/menus/help/HelpArticleDescriptions";
+import { HelpArticle } from "ui/screen/screens/menu/menus/help/IHelpArticle";
 declare const articles: Descriptions<HelpArticle, [string, string, string, string]>;
 export default articles;

package/definitions/game/language/impl/TranslationImpl.d.ts

@@ -95,6 +95,7 @@ export default class TranslationImpl implements Omit<ISerializable, "deserialize
      */
     get(...args: any[]): IStringSection[];
     private resolveSections;
+    static sectionStringRenderers: Array<((section: IStringSection) => string | undefined)>;
     /**
      * Returns the translation as a string
      */

package/definitions/game/language/segment/BindSegment.d.ts

@@ -14,9 +14,10 @@ export interface IBindingsSection extends IStringSection {
     bindable: Bindable | null;
     bindableNoBindingsFallback?: IStringSection[];
     bindableSimplify?: true;
+    bindableContextless?: true;
 }
 export declare namespace IBindingsSection {
-    function create(bindable: Bindable | null, fallback?: IStringSection[], simplify?: boolean): IBindingsSection;
+    function create(bindable: Bindable | null, fallback?: IStringSection[], simplify?: boolean, contextless?: boolean): IBindingsSection;
 }
 declare const bindSegment: ISegment;
 export default bindSegment;

package/definitions/game/mod/ModRegistry.d.ts

@@ -65,7 +65,7 @@ import type { DialogId, IDialogDescription } from "ui/screen/screens/game/Dialog
 import type { QuadrantComponentId } from "ui/screen/screens/game/IGameScreenApi";
 import type { IMenuBarButtonDescription, MenuBarButtonType } from "ui/screen/screens/game/static/menubar/IMenuBarButton";
 import type { IStatDisplayDescription } from "ui/screen/screens/game/static/stats/IStatDisplayDescription";
-import type { HelpArticle, IHelpArticle } from "ui/screen/screens/menu/menus/help/HelpArticleDescriptions";
+import type { HelpArticle, IHelpArticle } from "ui/screen/screens/menu/menus/help/IHelpArticle";
 import type { ModOptionSectionInitializer } from "ui/screen/screens/menu/menus/options/TabMods";
 export interface IModdable {
     /**

package/definitions/game/renderer/context/RendererContext.d.ts

@@ -25,6 +25,6 @@ export default class RendererContext {
     get isWebGl2(): boolean;
     get origin(): IRendererOrigin;
     get viewport(): IVector2;
-    createSpriteBatch(capacity: number, depthOffset?: number, yOffset?: number, enableAlphaMultiplcation?: boolean, enforceBeginAndEnd?: boolean): SpriteBatch1 | SpriteBatch2;
+    createSpriteBatch(capacity: number, depthOffset?: number, yOffset?: number, enableAlphaMultiplcation?: boolean, enforceBeginAndEnd?: boolean): SpriteBatch2 | SpriteBatch1;
     createPersistantSpriteBatch(depthOffset?: number, yOffset?: number, enableAlphaMultiplcation?: boolean): PersistantSpriteBatch;
 }

package/definitions/game/ui/component/Bindings.d.ts

@@ -17,19 +17,22 @@ export declare enum BindingsClasses {
     Main = "bindings",
     Macro = "bindings-macro",
     Input = "bindings-macro-input",
+    InputHoverItem = "bindings-macro-input-hover-item",
     InputIcon = "bindings-macro-input-icon",
     InputIconLabel = "bindings-macro-input-icon-label",
     Modifier = "bindings-macro-input-modifier",
-    MacroSeparator = "bindings-macro-separator"
+    MacroSeparator = "bindings-macro-separator",
+    MacroSeparatorPadded = "bindings-macro-separator-padded"
 }
 export default class Bindings extends Component {
     readonly bindable: Bindable | null;
     private readonly noBindingsFallback?;
     private readonly simplify?;
-    static createDisplays(bindable: Bindable | null, sortByComplexity?: true, simplify?: true): MacroDisplay[];
-    static createMacroDisplay(macro: Macro): MacroDisplay;
+    private readonly contextless?;
+    static createDisplays(bindable: Bindable | null, sortByComplexity?: true, simplify?: true, contextless?: true): MacroDisplay[];
+    static createMacroDisplay(macro: Macro, simplify?: true): MacroDisplay;
     macroDisplays: MacroDisplay[];
-    constructor(bindable: Bindable | null, noBindingsFallback?: (() => Text) | undefined, simplify?: true | undefined);
+    constructor(bindable: Bindable | null, noBindingsFallback?: (() => Text) | undefined, simplify?: true | undefined, contextless?: true | undefined);
     refresh(): this;
     protected onAppend(): void;
     protected onInvalidateBindings(): void;
@@ -41,7 +44,7 @@ declare class MacroDisplay extends Component {
     readonly macro: Macro;
     readonly inputDisplays: InputDisplay[];
     readonly complexity: number;
-    constructor(bindable: Bindable, macro: Macro, simplify?: true);
+    constructor(bindable: Bindable, macro: Macro, simplify?: true, contextless?: true);
     private addMacroSeparator;
 }
 declare class InputDisplay extends Component {

package/definitions/game/ui/component/Text.d.ts

@@ -23,6 +23,7 @@ import Translation from "language/Translation";
 import Component from "ui/component/Component";
 import type { TranslationGenerator } from "ui/component/IComponent";
 import type { IInput, Modifier } from "ui/input/IInput";
+import type { IMacroSection } from "ui/input/Macros";
 import type Tooltip from "ui/tooltip/Tooltip";
 import type { IReferenceSection, ISegment, IStringSection } from "utilities/string/Interpolator";
 export default class Text extends Component {
@@ -94,7 +95,7 @@ export declare class BasicText extends Component {
     protected inputModifier?: Modifier;
     currentTooltip?: (tooltip: Tooltip) => any;
     constructor(elementType?: string);
-    setText(text: IStringSection & Partial<IColorSection> & Partial<ILinkSection> & Partial<IHeadingSection> & Partial<ITooltipSection> & Partial<IReferenceSection> & Partial<IListItemSection> & Partial<IBindingsSection>, data?: IEntireTextData): this;
+    setText(text: IStringSection & Partial<IColorSection & ILinkSection & IHeadingSection & ITooltipSection & IReferenceSection & IListItemSection & IBindingsSection & IMacroSection>, data?: IEntireTextData): this;
     protected onRemove(): void;
     private setTooltipLocation;
     private onClick;

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

@@ -31,10 +31,8 @@ declare module Bindings {
     function reset(bindable: Bindable): void;
     function clear(bindable: Bindable): void;
     function resetAll(): void;
-    function translate(bindable?: Bindable, noBindings?: TranslationImpl, simplify?: true): TranslationImpl;
-    function translate(bindable?: Bindable, noBindings?: TranslationImpl | null, simplify?: true): TranslationImpl | undefined;
-    function translateRaw(bindable?: Bindable, noBindings?: TranslationImpl): TranslationImpl;
-    function translateRaw(bindable?: Bindable, noBindings?: TranslationImpl | null): TranslationImpl | undefined;
+    function translate(bindable?: Bindable, noBindings?: TranslationImpl, simplify?: true, contextless?: true): TranslationImpl;
+    function translate(bindable?: Bindable, noBindings?: TranslationImpl | null, simplify?: true, contextless?: true): TranslationImpl | undefined;
     function markCacheInvalid(updateBindableManagers?: boolean): void;
     function getBoundTo(binding: Binding): Set<Bindable>;
 }

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

@@ -24,7 +24,8 @@ export declare enum InputIcon {
     HoverItem = 5,
     Shift = 6,
     Ctrl = 7,
-    Alt = 8
+    Alt = 8,
+    Tap = 9
 }
 export declare namespace InputIcon {
     function get(catalyst: Modifier): InputIcon;

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

@@ -86,6 +86,12 @@ export declare module IInput {
         resolvedCatalyst: Modifier;
     }
     function modifiersResolvedHashes(input: IInput): [IModifierResolvedHash, IModifierResolvedHash?];
+    /**
+     * @deprecated This function returns raw text translations.
+     *
+     * You might be looking for {@link Macro.translate} — you can call it with a single-`IInput` macro, ie, `[IInput]`,
+     * and it will result in the fancy iconography and stuff.
+     */
     function translate(input: IInput, resolvedModifierCatalyst?: Modifier): TranslationImpl;
 }
 export {};

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

@@ -13,12 +13,20 @@ import type { IBindHandlerApi } from "ui/input/Bind";
 import type Bindable from "ui/input/Bindable";
 import { Binding } from "ui/input/Bindings";
 import { IInput } from "ui/input/IInput";
+import type { IStringSection } from "utilities/string/Interpolator";
+export interface IMacroSection extends IStringSection {
+    macro: Macro;
+    macroSimplify?: true;
+}
+export declare namespace IMacroSection {
+    function create(macro: Macro, simplify?: boolean): IMacroSection;
+}
 export type Macro = IInput[];
 export declare module Macro {
     function is(value: unknown): value is Macro;
     function of(inputOrMacro: IInput | Macro): Macro;
     function hash(macro: Macro): string;
-    function translate(macro: Macro): TranslationImpl;
+    function translate(macro: Macro, simplify?: true): TranslationImpl;
 }
 declare module Macros {
     interface IEvents {

package/definitions/game/ui/screen/screens/menu/menus/{HelpArticle.d.ts → HelpArticleMenu.d.ts}

@@ -9,7 +9,7 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import Menu from "ui/screen/screens/menu/component/Menu";
-import { HelpArticle } from "ui/screen/screens/menu/menus/help/HelpArticleDescriptions";
+import { HelpArticle } from "ui/screen/screens/menu/menus/help/IHelpArticle";
 export default class HelpArticleMenu extends Menu {
     constructor(article: HelpArticle);
     protected onGoBackFrom(): Promise<void>;

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

@@ -9,7 +9,7 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import Menu from "ui/screen/screens/menu/component/Menu";
-import { HelpArticle } from "ui/screen/screens/menu/menus/help/HelpArticleDescriptions";
+import { HelpArticle } from "ui/screen/screens/menu/menus/help/IHelpArticle";
 export default class HelpMenu extends Menu {
     private readonly searchInput;
     private readonly articles;

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

@@ -8,50 +8,10 @@
  * 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 { IModdable } from "mod/ModRegistry";
 import type { BasicText, BasicTextLink } from "ui/component/Text";
-export interface IHelpArticle extends IModdable {
-    /**
-     * Whether this article is "important", which makes it take up the full row (instead of sharing
-     * with another article). If the last article doesn't have a partner to share a row with, it appears
-     * as though it's an important article as well.
-     */
-    important?: true;
-    image?: true | string;
-    section?: string | number;
-}
-export declare enum HelpArticle {
-    Welcome = 0,
-    Controls = 1,
-    Interface = 2,
-    InventoryManagement = 3,
-    ActionSlots = 4,
-    FastPickUp = 5,
-    Actions = 6,
-    Stats = 7,
-    Doodads = 8,
-    ResourceGathering = 9,
-    AttackingDamage = 10,
-    Reputation = 11,
-    Milestones = 12,
-    HeldItems = 13,
-    Crafting = 14,
-    ItemQualities = 15,
-    Death = 16,
-    Taming = 17,
-    RestingSleeping = 18,
-    Overweight = 19,
-    Merchants = 20,
-    Gardening = 21,
-    GameModes = 22,
-    Multiplayer = 23,
-    Bugs = 24
-}
-export declare enum HelpArticleSection {
-    Interface = 0,
-    Gameplay = 1,
-    Other = 2
-}
+import type { IHelpArticle } from "ui/screen/screens/menu/menus/help/IHelpArticle";
+import { HelpArticle, HelpArticleSection } from "ui/screen/screens/menu/menus/help/IHelpArticle";
+export { HelpArticle, HelpArticleSection };
 declare const descriptions: Descriptions<HelpArticle, IHelpArticle>;
 export default descriptions;
 export declare function HelpArticleLinkHandler(text: BasicText, link: BasicTextLink): true | void;

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

@@ -0,0 +1,53 @@
+/*!
+ * Copyright 2011-2023 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 type { IModdable } from "mod/ModRegistry";
+export interface IHelpArticle extends IModdable {
+    /**
+     * Whether this article is "important", which makes it take up the full row (instead of sharing
+     * with another article). If the last article doesn't have a partner to share a row with, it appears
+     * as though it's an important article as well.
+     */
+    important?: true;
+    image?: true | string;
+    section?: string | number;
+}
+export declare enum HelpArticle {
+    Welcome = 0,
+    Controls = 1,
+    Interface = 2,
+    InventoryManagement = 3,
+    ActionSlots = 4,
+    FastPickUp = 5,
+    Actions = 6,
+    Stats = 7,
+    Doodads = 8,
+    ResourceGathering = 9,
+    AttackingDamage = 10,
+    Reputation = 11,
+    Milestones = 12,
+    HeldItems = 13,
+    Crafting = 14,
+    ItemQualities = 15,
+    Death = 16,
+    Taming = 17,
+    RestingSleeping = 18,
+    Overweight = 19,
+    Merchants = 20,
+    Gardening = 21,
+    GameModes = 22,
+    Multiplayer = 23,
+    Bugs = 24
+}
+export declare enum HelpArticleSection {
+    Interface = 0,
+    Gameplay = 1,
+    Other = 2
+}

package/definitions/game/ui/tooltip/TooltipLocationHandler.d.ts

@@ -58,6 +58,7 @@ export interface ITooltipLocation extends IVector2 {
     alignment?: Lowercase<keyof typeof TooltipLocationAlignment>;
 }
 export default class TooltipLocationHandler {
+    static make(handler: (location: TooltipLocationHandler) => TooltipLocationHandler): (location: TooltipLocationHandler) => TooltipLocationHandler;
     readonly locationPreference: ITooltipLocationPreference[];
     private readonly _tooltip;
     get tooltip(): Tooltip | undefined;

package/definitions/game/utilities/string/Interpolator.d.ts

@@ -35,7 +35,6 @@ export interface IStringSection {
     classes?: Set<string>;
     icon?: ISerializedIcon;
     forceInclude?: true;
-    stringOnly?: true;
 }
 export declare namespace IStringSection {
     function is(value: unknown): value is IStringSection;

package/package.json

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