@wayward/types 2.13.0-beta.dev.20230326.2 → 2.13.0-beta.dev.20230328.1

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

@@ -22,7 +22,7 @@ import { MessageManagerNoOp } from "game/entity/player/MessageManager";
 import { NoteManagerNoOp } from "game/entity/player/note/NoteManager";
 import { QuestManagerNoOp } from "game/entity/player/quest/QuestManager";
 import { TileUpdateType } from "game/IGame";
-import type { ItemType } from "game/item/IItem";
+import type { IContainer, ItemType } from "game/item/IItem";
 import type Item from "game/item/Item";
 import type Tile from "game/tile/Tile";
 import Translation from "language/Translation";
@@ -83,6 +83,7 @@ export default abstract class NPC extends Human<NPCType> {
     isWaiting(): boolean;
     getDamageModifier(): number;
     makeHostile(): void;
+    getPublicContainer(): IContainer | undefined;
     /**
      * The actions available to use with this npc
      */

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

@@ -15,6 +15,7 @@ import { EquipType } from "game/entity/IHuman";
 import type { INPCConstructorOptions } from "game/entity/npc/INPC";
 import NPC from "game/entity/npc/NPC";
 import type Player from "game/entity/player/Player";
+import type { IContainer } from "game/item/IItem";
 import { ItemType } from "game/item/IItem";
 import type Item from "game/item/Item";
 export interface IMerchantBuyPrice {
@@ -28,6 +29,7 @@ export default class MerchantNPC extends NPC {
     getCustomerCredit(customer: Human): number;
     modifyCustomerCredit(customer: Human, creditChange: number): number;
     getActions(): ActionType[] | undefined;
+    getPublicContainer(): IContainer | undefined;
     getSellPrice(player: Player, item: Item): number | undefined;
     getBuyPrice(player: Player, item: Item): IMerchantBuyPrice | undefined;
     /**

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

@@ -30,6 +30,7 @@ export default class ShipperNPC extends NPC {
      * Closes container dialogs
      */
     closeContainerDialogs(): void;
+    getPublicContainer(): IContainer | undefined;
     protected getReputationChangeOnDeath(): number;
     protected getDefaultName(): import("../../../../language/impl/TranslationImpl").default;
     protected initializeStats(): void;

package/definitions/game/game/temperature/TemperatureManager.d.ts

@@ -39,6 +39,7 @@ export default class TemperatureManager extends EventEmitter.Host<ITemperatureMa
     private readonly island;
     encodedCalculatedCache: Map<number, Map<number, Uint32Array>>;
     encodedProducedCache: Map<number, Map<number, Uint32Array>>;
+    encodedGuaranteedCorrectCache: Map<number, Map<number, Uint32Array>>;
     private readonly containerTemperatureCache;
     private readonly containerTileTemperatureCache;
     private readonly containerItemsTemperatureCache;
@@ -46,6 +47,7 @@ export default class TemperatureManager extends EventEmitter.Host<ITemperatureMa
     private readonly scheduledContainerInvalidations;
     private cacheCalculated;
     private cacheProduced;
+    private cacheGuaranteedCorrect;
     private temperatureBoundaryMax;
     temperatureBoundaryMaxVector: Vector2;
     constructor(island: Island);
@@ -95,16 +97,18 @@ export default class TemperatureManager extends EventEmitter.Host<ITemperatureMa
     /**
      * Returns the base temperature.
      */
-    getBase(): number;
+    getBiomeBase(): number;
     /**
      * Returns the temperature modifier at the given time.
      */
-    getTime(time?: TimeManager): number;
+    getBiomeTimeModifier(time?: TimeManager): number;
     getBiomeRange(): Readonly<IRange>;
     /**
      * Returns the temperature modifier of the given layer, at the given time.
      */
     getLayer(z: WorldZ, time?: TimeManager): number;
+    getLayerBase(z: WorldZ): number;
+    getLayerTimeModifier(z: WorldZ, time?: TimeManager): number;
     getLayerRange(z: WorldZ): IRange;
     private resolveTimeModifier;
     /**
@@ -157,7 +161,7 @@ export default class TemperatureManager extends EventEmitter.Host<ITemperatureMa
     private calculateRange;
     /**
      * Starting from the middle, set the calculated value of the tile to the maximum of all surrounding tiles minus the diffusion rate
-     * For each tile where the value is updated, update all surrounding tiles
+     * For each tile where the value is updated, update all surrounding tiles:
      * ```
      * - - 0 - -      - - 0 - -      - - 1 - -      - - 1 - -      - - 1 - -      - - 1 - -
      * - 0 0 0 -      - 0 3 0 -      - 0 3 0 -      - 0 3 1 -      - 1 3 1 -      - 1 3 1 -
@@ -174,7 +178,8 @@ export default class TemperatureManager extends EventEmitter.Host<ITemperatureMa
      * - 0 0 0 -      - 0 0 0 -
      * - - 0 - -      - - 0 - -
      * ```
-     * When this happens, if we allow the tiles to continue updating each other, it'll progress as such:
+     * If cascading skipped previously touched tiles, the temperature from the 9 wouldn't spread out to the full distance.
+     * Instead, if we allow the tiles to continue updating each other, it'll progress as such:
      * ```
      * - - 1 - -      - - 1 - -      - - 1 - -      - - 1 - -      - - 1 - -      - - 1 - -
      * - 1 3 7 9      - 1 3 7 9      - 1 3 7 9      - 1 3 7 9      - 1 3 7 9      - 1 3 7 9
@@ -188,7 +193,7 @@ export default class TemperatureManager extends EventEmitter.Host<ITemperatureMa
      *       - 1 3 3 -      - 1 3 3 -      - 1 3 3 -
      *       - - 1 - -      - - 1 - -      - - 1 - -
      * ```
-     * By not cascading updates if a tile's value wasn't actually updated, the algorithm actually makes itself more efficient.
+     * Instead we stop cascading updates to adjacent tiles *only* if a tile's value wasn't actually updated.
      */
     private recalculate;
     private calculateTile;

package/definitions/game/renderer/IRenderer.d.ts

@@ -123,7 +123,8 @@ export declare enum RenderSource {
     StartGame = 61,
     Steamworks = 62,
     Thumbnail = 63,
-    WorldLayerRendererFlush = 64
+    WorldLayerRendererFlush = 64,
+    GenericOverlay = 65
 }
 export declare function calculateAmbientLightLevel(origin: IFieldOfViewOrigin, z: number): number;
 export declare const ZOOM_LEVEL_MIN = 1;

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

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

package/definitions/game/renderer/overlay/GenericOverlay.d.ts

@@ -0,0 +1,24 @@
+/*!
+ * 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 type { IOverlayInfo } from "game/tile/ITerrain";
+import type Tile from "game/tile/Tile";
+export default abstract class GenericOverlay<OVERLAY extends IOverlayInfo = IOverlayInfo, PARAMS extends any[] = []> {
+    private readonly overlay;
+    protected alpha: number;
+    getDefaultAlpha(): number;
+    show(): void;
+    hide(): void;
+    addOrUpdate(tile: Tile, ...params: PARAMS): void;
+    protected abstract generateOverlayInfo(tile: Tile, ...params: PARAMS): OVERLAY | undefined;
+    protected updateOverlayAlpha(tile: Tile, overlay: OVERLAY, alpha: number): OVERLAY | undefined;
+    clear(): void;
+    private updateAlpha;
+}

package/definitions/game/renderer/spriteBatch/SpriteBatch1.d.ts

@@ -20,6 +20,7 @@ export default class SpriteBatch1 implements ISpriteBatch {
     readonly capacity: number;
     private readonly depthOffset;
     private readonly yOffset;
+    private readonly enableAlphaMultiplcation;
     private readonly shaderProgram;
     texSprites: WebGLTexture | undefined;
     inverseSpriteTextureSize: Vector2 | undefined;
@@ -31,7 +32,7 @@ export default class SpriteBatch1 implements ISpriteBatch {
     private begun;
     private _setup;
     static initializePrograms(webGlContext: WebGlContext): Promise<void>;
-    constructor(context: RendererContext, capacity: number, depthOffset?: number, yOffset?: number);
+    constructor(context: RendererContext, capacity: number, depthOffset?: number, yOffset?: number, enableAlphaMultiplcation?: boolean);
     setup(): void;
     delete(): void;
     clear(): void;

package/definitions/game/renderer/spriteBatch/SpriteBatch2.d.ts

@@ -20,6 +20,7 @@ export default class SpriteBatch2 implements ISpriteBatch {
     readonly capacity: number;
     private readonly depthOffset;
     private readonly yOffset;
+    private readonly enableAlphaMultiplcation;
     private readonly shaderProgram;
     texSprites: WebGLTexture | undefined;
     inverseSpriteTextureSize: Vector2 | undefined;
@@ -33,7 +34,7 @@ export default class SpriteBatch2 implements ISpriteBatch {
     private readonly vertexArray;
     private _setup;
     static initializePrograms(webGlContext: WebGlContext): Promise<void>;
-    constructor(context: RendererContext, capacity: number, depthOffset?: number, yOffset?: number);
+    constructor(context: RendererContext, capacity: number, depthOffset?: number, yOffset?: number, enableAlphaMultiplcation?: boolean);
     setup(): void;
     delete(): void;
     clear(): void;

package/definitions/game/utilities/math/IVector.d.ts

@@ -14,6 +14,9 @@ export interface IVector2 {
     x: number;
     y: number;
 }
+export declare namespace IVector2 {
+    function hash(v2: IVector2): number;
+}
 export interface IVector3 extends IVector2 {
     z: WorldZ;
 }

package/package.json

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

package/definitions/game/renderer/spriteBatch/SpriteBatch.d.ts

@@ -1,13 +0,0 @@
-/*!
- * 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 type RendererContext from "renderer/context/RendererContext";
-import type ISpriteBatch from "renderer/spriteBatch/ISpriteBatch";
-export declare function createSpriteBatch(context: RendererContext, capacity: number, depthOffset?: number, yOffset?: number): ISpriteBatch;