updated api

This commit is contained in:
Monica Moniot
2022-12-01 19:04:58 -05:00
parent 21abe6fb56
commit 30fe2946e6
104 changed files with 232 additions and 123 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
---@meta
---@diagnostic disable
--$Factorio 1.1.70
--$Factorio 1.1.72
--$Overlay 5
--$Section LuaGameScript
-- This file is automatically generated. Edits will be overwritten.
@@ -715,9 +715,9 @@ json_to_table=function(json)end,
---@param player PlayerIdentification@The player to kick.
---@param reason LocalisedString?@The reason given if any.
kick_player=function(player,reason)end,
---Marks two forces to be merged together. All entities in the source force will be reassigned to the target force. The source force will then be destroyed.
---Marks two forces to be merged together. All players and entities in the source force will be reassigned to the target force. The source force will then be destroyed. Importantly, this does not merge technologies or bonuses, which are instead retained from the target force.
---
---**Note:** The three built-in forces -- player, enemy and neutral -- can't be destroyed. I.e. they can't be used as the source argument to this function.
---**Note:** The three built-in forces (player, enemy and neutral) can't be destroyed, meaning they can't be used as the source argument to this function.
---
---**Note:** The source force is not removed until the end of the current tick, or if called during the [on_forces_merging](https://lua-api.factorio.com/latest/events.html#on_forces_merging) or [on_forces_merged](https://lua-api.factorio.com/latest/events.html#on_forces_merged) event, the end of the next tick.
---