typed-factorio 1.5.1 → 1.7.0

package/Changelog.md

@@ -1,3 +1,16 @@
+# v1.7.0
+
+- Updated to factorio version 1.1.67
+
+# v1.6.1
+
+- Fixed write type for `BoundingBox`.
+- Simplified types for BlueprintEntity.
+
+# v1.6.0
+
+- Updated to factorio version 1.1.64
+
 # v1.5.1
 
 - Added old `Read` types as deprecated type aliases of new types; to help with migration.

package/generated/classes.d.ts

@@ -2941,6 +2941,13 @@ interface LuaEntity extends LuaControl {
    * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.get_spider_legs Online documentation}
    */
   get_spider_legs(): LuaEntity[]
+  /**
+   * Stops the given SpiderVehicle.
+   *
+   * _Can only be used if this is SpiderVehicle_
+   * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.stop_spider Online documentation}
+   */
+  stop_spider(): void
   /**
    * Name of the entity prototype. E.g. "inserter" or "filter-inserter".
    * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.name Online documentation}
@@ -3941,21 +3948,21 @@ interface LuaEntity extends LuaControl {
    */
   readonly autopilot_destinations: MapPosition[]
   /**
-   * Amount of trains related to this particular train stop. Includes train stopped at this train stop (until it finds a path to next target) and trains having this train stop as goal or waypoint. Writing nil will disable the limit (will set a maximum possible value).
+   * Amount of trains related to this particular train stop. Includes train stopped at this train stop (until it finds a path to next target) and trains having this train stop as goal or waypoint.
    *
    * _Can only be used if this is TrainStop_
    * @remarks Train may be included multiple times when braking distance covers this train stop multiple times<br>Value may be read even when train stop has no control behavior
    * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.trains_count Online documentation}
    */
-  readonly trains_count: uint | nil
+  readonly trains_count: uint
   /**
-   * Amount of trains above which no new trains will be sent to this train stop.
+   * Amount of trains above which no new trains will be sent to this train stop. Writing nil will disable the limit (will set a maximum possible value).
    *
    * _Can only be used if this is TrainStop_
    * @remarks When a train stop has a control behavior with wire connected and set_trains_limit enabled, this value will be overwritten by it
    * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.trains_limit Online documentation}
    */
-  trains_limit: uint
+  trains_limit: uint | nil
   /**
    * (deprecated by 1.1.51) If this entity is a MilitaryTarget. Returns same value as LuaEntity::is_military_target
    * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.is_entity_with_force Online documentation}
@@ -4028,6 +4035,16 @@ interface LuaEntity extends LuaControl {
    * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.rocket_silo_status Online documentation}
    */
   readonly rocket_silo_status: defines.rocket_silo_status
+  /**
+   * Specifies the tiling size of the entity, is used to decide, if the center should be in the center of the tile (odd tile size dimension) or on the tile border (even tile size dimension). Uses the current direction of the entity.
+   * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.tile_width Online documentation}
+   */
+  readonly tile_width: uint
+  /**
+   * Specifies the tiling size of the entity, is used to decide, if the center should be in the center of the tile (odd tile size dimension) or on the tile border (even tile size dimension). Uses the current direction of the entity.
+   * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.tile_height Online documentation}
+   */
+  readonly tile_height: uint
   /**
    * Is this object valid? This Lua object holds a reference to an object within the game engine. It is possible that the game-engine object is removed whilst a mod still holds the corresponding Lua object. If that happens, the object becomes invalid, i.e. this attribute will be `false`. Mods are advised to check for object validity if any change to the game state might have occurred between the creation of the Lua object and its access.
    */
@@ -5058,6 +5075,16 @@ interface BaseEntity extends LuaControl {
    * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.rocket_silo_status Online documentation}
    */
   readonly rocket_silo_status: defines.rocket_silo_status
+  /**
+   * Specifies the tiling size of the entity, is used to decide, if the center should be in the center of the tile (odd tile size dimension) or on the tile border (even tile size dimension). Uses the current direction of the entity.
+   * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.tile_width Online documentation}
+   */
+  readonly tile_width: uint
+  /**
+   * Specifies the tiling size of the entity, is used to decide, if the center should be in the center of the tile (odd tile size dimension) or on the tile border (even tile size dimension). Uses the current direction of the entity.
+   * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.tile_height Online documentation}
+   */
+  readonly tile_height: uint
   /**
    * Is this object valid? This Lua object holds a reference to an object within the game engine. It is possible that the game-engine object is removed whilst a mod still holds the corresponding Lua object. If that happens, the object becomes invalid, i.e. this attribute will be `false`. Mods are advised to check for object validity if any change to the game state might have occurred between the creation of the Lua object and its access.
    */
@@ -5764,21 +5791,21 @@ interface TrainStopEntity extends BaseEntity {
    */
   readonly connected_rail_direction: defines.rail_direction
   /**
-   * Amount of trains related to this particular train stop. Includes train stopped at this train stop (until it finds a path to next target) and trains having this train stop as goal or waypoint. Writing nil will disable the limit (will set a maximum possible value).
+   * Amount of trains related to this particular train stop. Includes train stopped at this train stop (until it finds a path to next target) and trains having this train stop as goal or waypoint.
    *
    * _Can only be used if this is TrainStop_
    * @remarks Train may be included multiple times when braking distance covers this train stop multiple times<br>Value may be read even when train stop has no control behavior
    * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.trains_count Online documentation}
    */
-  readonly trains_count: uint | nil
+  readonly trains_count: uint
   /**
-   * Amount of trains above which no new trains will be sent to this train stop.
+   * Amount of trains above which no new trains will be sent to this train stop. Writing nil will disable the limit (will set a maximum possible value).
    *
    * _Can only be used if this is TrainStop_
    * @remarks When a train stop has a control behavior with wire connected and set_trains_limit enabled, this value will be overwritten by it
    * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.trains_limit Online documentation}
    */
-  trains_limit: uint
+  trains_limit: uint | nil
 }
 
 /**
@@ -5865,6 +5892,13 @@ interface SpiderVehicleEntity extends BaseEntity {
    * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.get_spider_legs Online documentation}
    */
   get_spider_legs(): LuaEntity[]
+  /**
+   * Stops the given SpiderVehicle.
+   *
+   * _Can only be used if this is SpiderVehicle_
+   * @see {@link https://lua-api.factorio.com/latest/LuaEntity.html#LuaEntity.stop_spider Online documentation}
+   */
+  stop_spider(): void
   /**
    * The torso orientation of this spider vehicle.
    *
@@ -7782,6 +7816,16 @@ interface LuaEntityPrototype {
    * @see {@link https://lua-api.factorio.com/latest/LuaEntityPrototype.html#LuaEntityPrototype.use_exact_mode Online documentation}
    */
   readonly use_exact_mode?: boolean
+  /**
+   * Specifies the tiling size of the entity, is used to decide, if the center should be in the center of the tile (odd tile size dimension) or on the tile border (even tile size dimension)
+   * @see {@link https://lua-api.factorio.com/latest/LuaEntityPrototype.html#LuaEntityPrototype.tile_width Online documentation}
+   */
+  readonly tile_width: uint
+  /**
+   * Specifies the tiling size of the entity, is used to decide, if the center should be in the center of the tile (odd tile size dimension) or on the tile border (even tile size dimension)
+   * @see {@link https://lua-api.factorio.com/latest/LuaEntityPrototype.html#LuaEntityPrototype.tile_height Online documentation}
+   */
+  readonly tile_height: uint
   /**
    * The current movement speed of this character, including effects from exoskeletons, tiles, stickers and shooting.
    *
@@ -8272,6 +8316,16 @@ interface BaseEntityPrototype {
    * @see {@link https://lua-api.factorio.com/latest/LuaEntityPrototype.html#LuaEntityPrototype.manual_range_modifier Online documentation}
    */
   readonly manual_range_modifier?: double
+  /**
+   * Specifies the tiling size of the entity, is used to decide, if the center should be in the center of the tile (odd tile size dimension) or on the tile border (even tile size dimension)
+   * @see {@link https://lua-api.factorio.com/latest/LuaEntityPrototype.html#LuaEntityPrototype.tile_width Online documentation}
+   */
+  readonly tile_width: uint
+  /**
+   * Specifies the tiling size of the entity, is used to decide, if the center should be in the center of the tile (odd tile size dimension) or on the tile border (even tile size dimension)
+   * @see {@link https://lua-api.factorio.com/latest/LuaEntityPrototype.html#LuaEntityPrototype.tile_height Online documentation}
+   */
+  readonly tile_height: uint
   /**
    * Is this object valid? This Lua object holds a reference to an object within the game engine. It is possible that the game-engine object is removed whilst a mod still holds the corresponding Lua object. If that happens, the object becomes invalid, i.e. this attribute will be `false`. Mods are advised to check for object validity if any change to the game state might have occurred between the creation of the Lua object and its access.
    */
@@ -9883,6 +9937,19 @@ interface LuaEquipmentGrid {
    * @see {@link https://lua-api.factorio.com/latest/LuaEquipmentGrid.html#LuaEquipmentGrid.get_contents Online documentation}
    */
   get_contents(): Record<string, uint>
+  /**
+   * Find equipment by name.
+   * @param equipment Prototype name of the equipment to find.
+   * @returns The first found equipment, or `nil` if equipment could not be found.
+   * @see {@link https://lua-api.factorio.com/latest/LuaEquipmentGrid.html#LuaEquipmentGrid.find Online documentation}
+   */
+  find(equipment: string): LuaEquipment | nil
+  /**
+   * Get the number of all or some equipment in this grid.
+   * @param equipment Prototype name of the equipment to count. If not specified, count all equipment.
+   * @see {@link https://lua-api.factorio.com/latest/LuaEquipmentGrid.html#LuaEquipmentGrid.count Online documentation}
+   */
+  count(equipment?: string): uint
   readonly prototype: LuaEquipmentGridPrototype
   /**
    * Width of the equipment grid.
@@ -10789,7 +10856,7 @@ interface LuaForce {
    * ```
    * @see {@link https://lua-api.factorio.com/latest/LuaForce.html#LuaForce.chart Online documentation}
    */
-  chart(surface: SurfaceIdentification, area: BoundingBoxWrite): void
+  chart(surface: SurfaceIdentification, area: BoundingBoxWrite | BoundingBoxArray): void
   /**
    * Erases chart data for this force.
    * @param surface Which surface to erase chart data for or if not provided all surfaces charts are erased.
@@ -10952,7 +11019,7 @@ interface LuaForce {
    * Finds all custom chart tags within the given bounding box on the given surface.
    * @see {@link https://lua-api.factorio.com/latest/LuaForce.html#LuaForce.find_chart_tags Online documentation}
    */
-  find_chart_tags(surface: SurfaceIdentification, area?: BoundingBoxWrite): LuaCustomChartTag[]
+  find_chart_tags(surface: SurfaceIdentification, area?: BoundingBoxWrite | BoundingBoxArray): LuaCustomChartTag[]
   /**
    * Gets the saved progress for the given technology or `nil` if there is no saved progress.
    * @param technology The technology
@@ -11294,6 +11361,17 @@ interface LuaForce {
    * @see {@link https://lua-api.factorio.com/latest/LuaForce.html#LuaForce.research_enabled Online documentation}
    */
   readonly research_enabled: boolean
+  /**
+   * Custom color for this force. If specified, will take priority over other sources of the force color. Writing nil clears custom color. Will return nil if it was not specified or if was set to {0,0,0,0}
+   * @see {@link https://lua-api.factorio.com/latest/LuaForce.html#LuaForce.custom_color Online documentation}
+   */
+  get custom_color(): Color
+  set custom_color(value: Color | ColorArray)
+  /**
+   * Effective color of this force.
+   * @see {@link https://lua-api.factorio.com/latest/LuaForce.html#LuaForce.color Online documentation}
+   */
+  readonly color: Color
   /**
    * Is this object valid? This Lua object holds a reference to an object within the game engine. It is possible that the game-engine object is removed whilst a mod still holds the corresponding Lua object. If that happens, the object becomes invalid, i.e. this attribute will be `false`. Mods are advised to check for object validity if any change to the game state might have occurred between the creation of the Lua object and its access.
    */
@@ -15975,7 +16053,7 @@ interface LuaItemStack {
     /**
      * The area to deconstruct
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * If chunks covered by fog-of-war are skipped.
      */
@@ -16001,7 +16079,7 @@ interface LuaItemStack {
     /**
      * The area to deconstruct
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * If chunks covered by fog-of-war are skipped.
      */
@@ -16028,7 +16106,7 @@ interface LuaItemStack {
     /**
      * The bounding box
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * When true, blueprintable tiles are always included in the blueprint. When false they're only included if no entities exist in the setup area.
      */
@@ -16617,7 +16695,7 @@ interface BaseItemStack {
     /**
      * The area to deconstruct
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * If chunks covered by fog-of-war are skipped.
      */
@@ -16643,7 +16721,7 @@ interface BaseItemStack {
     /**
      * The area to deconstruct
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * If chunks covered by fog-of-war are skipped.
      */
@@ -16670,7 +16748,7 @@ interface BaseItemStack {
     /**
      * The bounding box
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * When true, blueprintable tiles are always included in the blueprint. When false they're only included if no entities exist in the setup area.
      */
@@ -18276,7 +18354,7 @@ interface LuaPlayer extends LuaControl {
    */
   remove_alert(params: {
     readonly entity?: LuaEntity
-    readonly prototype?: LuaEntityPrototype
+    readonly prototype?: LuaEntityPrototype | string
     readonly position?: MapPosition | MapPositionArray
     readonly type?: defines.alert_type
     readonly surface?: SurfaceIdentification
@@ -21913,7 +21991,7 @@ interface HighlightBoxSurfaceCreateEntity extends BaseSurfaceCreateEntity {
   /**
    * The bounding box defining the highlight box using absolute map coordinates. If specified, the general `position` parameter still needs to be present, but will be ignored. If not specified, the game falls back to the `source` parameter first, then the `target` parameter second. One of these three parameters need to be specified.
    */
-  readonly bounding_box?: BoundingBoxWrite
+  readonly bounding_box?: BoundingBoxWrite | BoundingBoxArray
   /**
    * Specifies the graphical appearance (color) of the highlight box. Defaults to `"electricity"`.
    */
@@ -22077,7 +22155,7 @@ interface LuaSurface {
    * ```
    * @see {@link https://lua-api.factorio.com/latest/LuaSurface.html#LuaSurface.find_entities Online documentation}
    */
-  find_entities(area?: BoundingBoxWrite): LuaEntity[]
+  find_entities(area?: BoundingBoxWrite | BoundingBoxArray): LuaEntity[]
   /**
    * Find all entities of the given type or name in the given area.
    *
@@ -22100,7 +22178,7 @@ interface LuaSurface {
    * @see {@link https://lua-api.factorio.com/latest/LuaSurface.html#LuaSurface.find_entities_filtered Online documentation}
    */
   find_entities_filtered(params: {
-    readonly area?: BoundingBoxWrite
+    readonly area?: BoundingBoxWrite | BoundingBoxArray
     /**
      * Has precedence over area field.
      */
@@ -22131,7 +22209,7 @@ interface LuaSurface {
    * @see {@link https://lua-api.factorio.com/latest/LuaSurface.html#LuaSurface.find_tiles_filtered Online documentation}
    */
   find_tiles_filtered(params: {
-    readonly area?: BoundingBoxWrite
+    readonly area?: BoundingBoxWrite | BoundingBoxArray
     /**
      * Ignored if not given with radius.
      */
@@ -22165,7 +22243,7 @@ interface LuaSurface {
    * @see {@link https://lua-api.factorio.com/latest/LuaSurface.html#LuaSurface.count_entities_filtered Online documentation}
    */
   count_entities_filtered(params: {
-    readonly area?: BoundingBoxWrite
+    readonly area?: BoundingBoxWrite | BoundingBoxArray
     readonly position?: MapPosition | MapPositionArray
     /**
      * If given with position, will count all entities within the radius of the position.
@@ -22194,7 +22272,7 @@ interface LuaSurface {
    * @see {@link https://lua-api.factorio.com/latest/LuaSurface.html#LuaSurface.count_tiles_filtered Online documentation}
    */
   count_tiles_filtered(params: {
-    readonly area?: BoundingBoxWrite
+    readonly area?: BoundingBoxWrite | BoundingBoxArray
     /**
      * Ignored if not given with radius.
      */
@@ -22250,7 +22328,7 @@ interface LuaSurface {
    */
   find_non_colliding_position_in_box(
     name: string,
-    search_space: BoundingBoxWrite,
+    search_space: BoundingBoxWrite | BoundingBoxArray,
     precision: double,
     force_to_tile_center?: boolean
   ): MapPosition | nil
@@ -22304,7 +22382,7 @@ interface LuaSurface {
     /**
      * Box to find units within.
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * Force performing the search.
      */
@@ -22592,7 +22670,7 @@ interface LuaSurface {
     /**
      * The area to mark for deconstruction.
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * The force whose bots should perform the deconstruction.
      */
@@ -22621,7 +22699,7 @@ interface LuaSurface {
     /**
      * The area to cancel deconstruction orders in.
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * The force whose deconstruction orders to cancel.
      */
@@ -22650,7 +22728,7 @@ interface LuaSurface {
     /**
      * The area to mark for upgrade.
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * The force whose bots should perform the upgrade.
      */
@@ -22679,7 +22757,7 @@ interface LuaSurface {
     /**
      * The area to cancel upgrade orders in.
      */
-    readonly area: BoundingBoxWrite
+    readonly area: BoundingBoxWrite | BoundingBoxArray
     /**
      * The force whose upgrade orders to cancel.
      */
@@ -22761,7 +22839,7 @@ interface LuaSurface {
    * @see {@link https://lua-api.factorio.com/latest/LuaSurface.html#LuaSurface.destroy_decoratives Online documentation}
    */
   destroy_decoratives(params: {
-    readonly area?: BoundingBoxWrite
+    readonly area?: BoundingBoxWrite | BoundingBoxArray
     readonly position?: TilePosition | TilePositionArray
     readonly name?: string | readonly string[] | LuaDecorativePrototype | readonly LuaDecorativePrototype[]
     readonly collision_mask?: CollisionMaskLayer | readonly CollisionMaskLayer[]
@@ -22802,7 +22880,7 @@ interface LuaSurface {
    * @see {@link https://lua-api.factorio.com/latest/LuaSurface.html#LuaSurface.find_decoratives_filtered Online documentation}
    */
   find_decoratives_filtered(params: {
-    readonly area?: BoundingBoxWrite
+    readonly area?: BoundingBoxWrite | BoundingBoxArray
     readonly position?: TilePosition | TilePositionArray
     readonly name?: string | readonly string[] | LuaDecorativePrototype | readonly LuaDecorativePrototype[]
     readonly collision_mask?: CollisionMaskLayer | readonly CollisionMaskLayer[]
@@ -22870,8 +22948,8 @@ interface LuaSurface {
    * @see {@link https://lua-api.factorio.com/latest/LuaSurface.html#LuaSurface.clone_area Online documentation}
    */
   clone_area(params: {
-    readonly source_area: BoundingBoxWrite
-    readonly destination_area: BoundingBoxWrite
+    readonly source_area: BoundingBoxWrite | BoundingBoxArray
+    readonly destination_area: BoundingBoxWrite | BoundingBoxArray
     readonly destination_surface?: SurfaceIdentification
     readonly destination_force?: LuaForce | string
     /**
@@ -22990,7 +23068,7 @@ interface LuaSurface {
     /**
      * The dimensions of the object that's supposed to travel the path.
      */
-    readonly bounding_box: BoundingBoxWrite
+    readonly bounding_box: BoundingBoxWrite | BoundingBoxArray
     /**
      * The list of masks the `bounding_box` collides with.
      */
@@ -23020,7 +23098,7 @@ interface LuaSurface {
      */
     readonly can_open_gates?: boolean
     /**
-     * Defines how coarse the pathfinder's grid is. Smaller values mean a coarser grid (negative numbers allowed). Defaults to `0`.
+     * Defines how coarse the pathfinder's grid is. Smaller values mean a coarser grid (negative numbers allowed). Allowed values are from -8 to 8. Defaults to `0`.
      */
     readonly path_resolution_modifier?: int
     /**
@@ -23155,7 +23233,7 @@ interface LuaSurface {
    * @param area The tile area.
    * @see {@link https://lua-api.factorio.com/latest/LuaSurface.html#LuaSurface.build_checkerboard Online documentation}
    */
-  build_checkerboard(area: BoundingBoxWrite): void
+  build_checkerboard(area: BoundingBoxWrite | BoundingBoxArray): void
   /**
    * The name of this surface. Names are unique among surfaces.
    * @remarks the default surface can't be renamed.

package/generated/concepts.d.ts

@@ -351,7 +351,7 @@ interface ScriptArea {
  * @see {@link https://lua-api.factorio.com/latest/Concepts.html#ScriptArea Online documentation}
  */
 interface ScriptAreaWrite {
-  readonly area: BoundingBoxWrite
+  readonly area: BoundingBoxWrite | BoundingBoxArray
   readonly name: string
   readonly color: Color | ColorArray
   readonly id: uint
@@ -1144,8 +1144,8 @@ interface BlueprintEntity {
   readonly output_priority?: "right" | "left"
   /** Filter of the splitter. Name of the item prototype the filter is set to. */
   readonly filter?: string
-  /** Filters of the filter inserter or loader. Array of {@link BlueprintItemFilter Item filter} objects. */
-  readonly filters?: BlueprintItemFilter[]
+  /** Filters of the filter inserter or loader. Array of {@link InventoryFilter} objects. */
+  readonly filters?: InventoryFilter[]
   /** Filter mode of the filter inserter. Either "whitelist" or "blacklist". */
   readonly filter_mode?: "whitelist" | "blacklist"
   /** The stack size the inserter is set to. */
@@ -1155,13 +1155,13 @@ interface BlueprintEntity {
   /** The pickup position the inserter is set to. */
   readonly pickup_position?: MapPosition
   /** Used by {@link https://wiki.factorio.com/Prototype/LogisticContainer Prototype/LogisticContainer}. */
-  readonly request_filters?: BlueprintLogisticFilter[]
+  readonly request_filters?: LogisticFilter[]
   /** Whether this requester chest can request from buffer chests. */
   readonly request_from_buffers?: boolean
   /** Used by {@link https://wiki.factorio.com/Programmable_speaker Programmable speaker}. */
-  readonly parameters?: BlueprintSpeakerParameter
+  readonly parameters?: ProgrammableSpeakerParameters
   /** Used by {@link https://wiki.factorio.com/Programmable_speaker Programmable speaker}. */
-  readonly alert_parameters?: BlueprintSpeakerAlertParameter
+  readonly alert_parameters?: ProgrammableSpeakerAlertParameters
   /** Used by the rocket silo, whether auto launch is enabled. */
   readonly auto_launch?: boolean
   /** Used by {@link https://wiki.factorio.com/Prototype/SimpleEntityWithForce Prototype/SimpleEntityWithForce} or {@link https://wiki.factorio.com/Prototype/SimpleEntityWithOwner Prototype/SimpleEntityWithOwner}. */
@@ -1215,63 +1215,58 @@ interface BlueprintCircuitConnection {
 }
 
 interface BlueprintInventory {
-  readonly filters?: BlueprintItemFilter[]
+  readonly filters?: InventoryFilter[]
   /** The index of the first inaccessible item slot due to limiting with the red "bar". 0-based. */
   readonly bar?: uint16
 }
 
-interface BlueprintItemFilter {
-  /** Name of the item prototype this filter is set to. */
-  readonly name: string
-  /** Index of the filter, 1-based. */
-  readonly index: uint
-}
-
 interface BlueprintInfinitySettings {
   /** Whether the "remove unfiltered items" checkbox is checked. */
   readonly remove_unfiltered_items: boolean
   /** Filters of the infinity container. */
-  readonly filters?: BlueprintInfinityFilter[]
-}
-
-interface BlueprintInfinityFilter {
-  /** Name of the item prototype this filter is set to. */
-  readonly name: string
-  /** Number the filter is set to. */
-  readonly count: uint
-  /** Mode of the filter. Either "at-least", "at-most", or "exactly". */
-  readonly mode: "at-least" | "at-most" | "exactly"
-  /** Index of the filter, 1-based. */
-  readonly index: uint
-}
-
-interface BlueprintLogisticFilter {
-  /** Name of the item prototype this filter is set to. */
-  readonly name: string
-  /** Index of the filter, 1-based. */
-  readonly index: uint
-  /** Number the filter is set to. Is 0 for storage chests. */
-  readonly count: uint
+  readonly filters?: InfinityInventoryFilter[]
 }
 
-interface BlueprintSpeakerParameter {
-  /** Volume of the speaker. */
-  readonly playback_volume: double
-  /** Whether global playback is enabled. */
-  readonly playback_globally: boolean
-  /** Whether polyphony is allowed. */
-  readonly allow_polyphony: boolean
-}
-
-interface BlueprintSpeakerAlertParameter {
-  /** Whether an alert is shown. */
-  readonly show_alert: boolean
-  /** Whether an alert icon is shown on the map. */
-  readonly show_on_map: boolean
-  /** The icon that is displayed with the alert. */
-  readonly icon_signal_id: SignalID
-  /** Message of the alert. */
-  readonly alert_message: string
+interface BlueprintControlBehavior {
+  readonly condition?: CircuitCondition
+  readonly circuit_condition?: CircuitCondition
+  readonly filters?: Signal[]
+  readonly is_on?: boolean
+  readonly arithmetic_conditions?: ArithmeticCombinatorParameters
+  readonly decider_conditions?: DeciderCombinatorParameters
+  readonly circuit_enable_disable?: boolean
+  readonly circuit_read_resources?: boolean
+  readonly circuit_resource_read_mode?: defines.control_behavior.mining_drill.resource_read_mode
+  readonly read_stopped_train?: boolean
+  readonly train_stopped_signal?: SignalID
+  readonly read_from_train?: boolean
+  readonly send_to_train?: boolean
+  readonly circuit_mode_of_operation?:
+    | defines.control_behavior.inserter.circuit_mode_of_operation
+    | defines.control_behavior.logistic_container.circuit_mode_of_operation
+    | defines.control_behavior.lamp.circuit_mode_of_operation
+  readonly circuit_read_hand_contents?: boolean
+  readonly circuit_hand_read_mode?: defines.control_behavior.inserter.hand_read_mode
+  readonly circuit_set_stack_size?: boolean
+  readonly stack_control_input_signal?: SignalID
+  readonly use_colors?: boolean
+  readonly read_robot_stats?: boolean
+  readonly read_logistics?: boolean
+  readonly available_logistic_output_signal?: boolean
+  readonly total_logistic_output_signal?: boolean
+  readonly available_construction_output_signal?: boolean
+  readonly total_construction_output_signal?: boolean
+  readonly circuit_contents_read_mode?: defines.control_behavior.transport_belt.content_read_mode
+  readonly output_signal?: SignalID
+  readonly circuit_close_signal?: boolean
+  readonly circuit_read_signal?: boolean
+  readonly red_output_signal?: SignalID
+  readonly orange_output_signal?: SignalID
+  readonly green_output_signal?: SignalID
+  readonly blue_output_signal?: SignalID
+  readonly circuit_open_gate?: boolean
+  readonly circuit_read_sensor?: boolean
+  readonly circuit_parameters?: ProgrammableSpeakerCircuitParameters
 }
 
 /**
@@ -1335,8 +1330,8 @@ interface BlueprintEntityWrite {
   readonly output_priority?: "right" | "left"
   /** Filter of the splitter. Name of the item prototype the filter is set to. */
   readonly filter?: string
-  /** Filters of the filter inserter or loader. Array of {@link BlueprintItemFilter Item filter} objects. */
-  readonly filters?: BlueprintItemFilter[]
+  /** Filters of the filter inserter or loader. Array of {@link InventoryFilter} objects. */
+  readonly filters?: InventoryFilter[]
   /** Filter mode of the filter inserter. Either "whitelist" or "blacklist". */
   readonly filter_mode?: "whitelist" | "blacklist"
   /** The stack size the inserter is set to. */
@@ -1346,13 +1341,13 @@ interface BlueprintEntityWrite {
   /** The pickup position the inserter is set to. */
   readonly pickup_position?: MapPosition
   /** Used by {@link https://wiki.factorio.com/Prototype/LogisticContainer Prototype/LogisticContainer}. */
-  readonly request_filters?: BlueprintLogisticFilter[]
+  readonly request_filters?: LogisticFilter[]
   /** Whether this requester chest can request from buffer chests. */
   readonly request_from_buffers?: boolean
   /** Used by {@link https://wiki.factorio.com/Programmable_speaker Programmable speaker}. */
-  readonly parameters?: BlueprintSpeakerParameter
+  readonly parameters?: ProgrammableSpeakerParameters
   /** Used by {@link https://wiki.factorio.com/Programmable_speaker Programmable speaker}. */
-  readonly alert_parameters?: BlueprintSpeakerAlertParameter
+  readonly alert_parameters?: ProgrammableSpeakerAlertParameters
   /** Used by the rocket silo, whether auto launch is enabled. */
   readonly auto_launch?: boolean
   /** Used by {@link https://wiki.factorio.com/Prototype/SimpleEntityWithForce Prototype/SimpleEntityWithForce} or {@link https://wiki.factorio.com/Prototype/SimpleEntityWithOwner Prototype/SimpleEntityWithOwner}. */
@@ -3403,6 +3398,9 @@ interface AmmoType {
    * Energy consumption of a single shot, if applicable. Defaults to `0`.
    */
   readonly energy_consumption?: double
+  readonly range_modifier?: double
+  readonly cooldown_modifier?: double
+  readonly consumption_modifier?: double
 }
 
 interface BeamTarget {
@@ -3569,6 +3567,7 @@ interface ModuleEffects {
  * - `"not-selectable-in-game"`: Disallows selection of the entity even when a selection box is specified for other reasons. For example, selection boxes are used to determine the size of outlines to be shown when highlighting entities inside electric pole ranges.
  * - `"not-upgradable"`: Prevents the entity from being selected by the upgrade planner.
  * - `"not-in-kill-statistics"`: Prevents the entity from being shown in the kill statistics.
+ * - `"not-in-made-in"`: Prevents the entity from being shown in the "made in" list in recipe tooltips.
  * @see {@link https://lua-api.factorio.com/latest/Concepts.html#EntityPrototypeFlags Online documentation}
  */
 interface EntityPrototypeFlags {
@@ -3669,6 +3668,10 @@ interface EntityPrototypeFlags {
    * Prevents the entity from being shown in the kill statistics.
    */
   readonly "not-in-kill-statistics"?: true
+  /**
+   * Prevents the entity from being shown in the "made in" list in recipe tooltips.
+   */
+  readonly "not-in-made-in"?: true
 }
 
 /**
@@ -4119,9 +4122,9 @@ interface LogisticFilter {
  */
 interface ModSetting {
   /**
-   * The value of the mod setting. The type depends on the setting.
+   * The value of the mod setting. The type depends on the kind of setting.
    */
-  readonly value: uint | double | boolean | string
+  readonly value: int | double | boolean | string
 }
 
 /**
@@ -8842,45 +8845,3 @@ type RaiseableEvents =
   | typeof defines.events.script_raised_destroy
   | typeof defines.events.script_raised_revive
   | typeof defines.events.script_raised_set_tiles
-
-interface BlueprintControlBehavior {
-  readonly condition?: CircuitCondition
-  readonly circuit_condition?: CircuitCondition
-  readonly filters?: Signal[]
-  readonly is_on?: boolean
-  readonly arithmetic_conditions?: ArithmeticCombinatorParameters
-  readonly decider_conditions?: DeciderCombinatorParameters
-  readonly circuit_enable_disable?: boolean
-  readonly circuit_read_resources?: boolean
-  readonly circuit_resource_read_mode?: defines.control_behavior.mining_drill.resource_read_mode
-  readonly read_stopped_train?: boolean
-  readonly train_stopped_signal?: SignalID
-  readonly read_from_train?: boolean
-  readonly send_to_train?: boolean
-  readonly circuit_mode_of_operation?:
-    | defines.control_behavior.inserter.circuit_mode_of_operation
-    | defines.control_behavior.logistic_container.circuit_mode_of_operation
-    | defines.control_behavior.lamp.circuit_mode_of_operation
-  readonly circuit_read_hand_contents?: boolean
-  readonly circuit_hand_read_mode?: defines.control_behavior.inserter.hand_read_mode
-  readonly circuit_set_stack_size?: boolean
-  readonly stack_control_input_signal?: SignalID
-  readonly use_colors?: boolean
-  readonly read_robot_stats?: boolean
-  readonly read_logistics?: boolean
-  readonly available_logistic_output_signal?: boolean
-  readonly total_logistic_output_signal?: boolean
-  readonly available_construction_output_signal?: boolean
-  readonly total_construction_output_signal?: boolean
-  readonly circuit_contents_read_mode?: defines.control_behavior.transport_belt.content_read_mode
-  readonly output_signal?: SignalID
-  readonly circuit_close_signal?: boolean
-  readonly circuit_read_signal?: boolean
-  readonly red_output_signal?: SignalID
-  readonly orange_output_signal?: SignalID
-  readonly green_output_signal?: SignalID
-  readonly blue_output_signal?: SignalID
-  readonly circuit_open_gate?: boolean
-  readonly circuit_read_sensor?: boolean
-  readonly circuit_parameters?: ProgrammableSpeakerCircuitParameters
-}

package/generated/defines.d.ts

@@ -1572,6 +1572,10 @@ declare namespace defines {
     wire_dragging,
     write_to_console,
   }
+  enum input_method {
+    keyboard_and_mouse,
+    game_controller,
+  }
   enum inventory {
     fuel,
     burnt_result,

package/generated/events.d.ts

@@ -201,6 +201,8 @@ interface OnCancelledDeconstructionEvent extends EventData {
 interface OnCancelledUpgradeEvent extends EventData {
   readonly entity: LuaEntity
   readonly player_index?: PlayerIndex
+  readonly target: LuaEntityPrototype
+  readonly direction?: defines.direction
   /**
    * Identifier of the event
    */
@@ -2973,6 +2975,7 @@ interface OnPreGhostUpgradedEvent extends EventData {
    */
   readonly player_index?: PlayerIndex
   readonly ghost: LuaEntity
+  readonly target: LuaEntityPrototype
   /**
    * Identifier of the event
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typed-factorio",
-  "version": "1.5.1",
+  "version": "1.7.0",
   "description": "Featureful typescript definitions for the the Factorio modding lua api.",
   "keywords": [
     "factorio",
@@ -22,8 +22,9 @@
     "lint": "eslint .",
     "check": "yarn run lint && yarn run test",
     "prepublishOnly": "yarn run check",
-    "download-latest-runtime-api": "ts-node ./scripts/downloadLatest.ts",
-    "next-version": "yarn run download-latest-runtime-api && yarn run clean && yarn test && yarn version --minor"
+    "download-latest-runtime-api": "ts-node ./scripts/download-latest.ts",
+    "new-version-changelog": "ts-node ./scripts/new-version-changelog.ts",
+    "next-version": "yarn run download-latest-runtime-api && yarn run clean && yarn run check && yarn run new-version-changelog && git add . && yarn version --minor"
   },
   "peerDependencies": {
     "lua-types": "^2.11.0",