Merge branch 'master' into Frozen

control.lua

@@ -23,7 +23,11 @@ for event, _ in pairs(gui_events) do
 	script.on_event(event, process_gui_event)
 end
 
+---@param favorite_foods table
+---@param locale string
+---@return table
 _G.generate_favorite_food_tooltip = function(favorite_foods, locale)
+    ---@type (string|table)[]
 	local favorites = {''}
 	for food, actions in pairs(favorite_foods) do
 		favorites[#favorites + 1] = {locale .. '.favorite-foods-sub', '[item=' .. food .. ']', game.item_prototypes[food].localised_name, actions}
@@ -34,6 +38,7 @@ _G.generate_favorite_food_tooltip = function(favorite_foods, locale)
 end
 
 _G.generate_allowed_module_tooltip = function(allowed_modules)
+    ---@type (string|table)[]
 	local favorites = {'', {'gui.module-description'}, '\n'}
 	for module, _ in pairs(allowed_modules) do
 		favorites[#favorites + 1] = {'', '[font=heading-2][item=' .. module .. '][/font]', ' ', game.item_prototypes[module].localised_name}
@@ -55,19 +60,20 @@ _G.draw_error_sprite = function(entity, sprite, time_to_live)
     }
 end
 
-require 'scripts/wiki/text-pages'
-require 'scripts/caravan/caravan'
-require 'scripts/digosaurus/digosaurus'
-require 'scripts/ocula/ocula'
-require 'scripts/farming/farming'
-require 'scripts/slaughterhouse/slaughterhouse'
-require 'scripts/smart-farm/smart-farm'
-require 'scripts/worm/worm'
-require 'scripts/turd/turd'
-require 'scripts/vatbrain/vatbrain'
-require 'scripts/ulric/ulric'
-require 'scripts/biofluid/biofluid'
-require 'scripts/mounts/mounts'
+require 'scripts.wiki.text-pages'
+require 'scripts.caravan.caravan'
+require 'scripts.digosaurus.digosaurus'
+require 'scripts.ocula.ocula'
+---@diagnostic disable-next-line: different-requires
+require 'scripts.farming.farming'
+require 'scripts.slaughterhouse.slaughterhouse'
+require 'scripts.smart-farm.smart-farm'
+require 'scripts.worm.worm'
+require 'scripts.turd.turd'
+require 'scripts.vatbrain.vatbrain'
+require 'scripts.ulric.ulric'
+require 'scripts.biofluid.biofluid'
+require 'scripts.mounts.mounts'
 
 local function discoscience()
     if remote.interfaces['DiscoScience'] and remote.interfaces['DiscoScience']['setIngredientColor'] then

data.lua

@@ -373,44 +373,6 @@ if mods['pyalternativeenergy'] then
     require 'prototypes/buildings/zungror-lair-mk04'
 end
 
---((SPACE BUILDINGS))--
---[[
-require 'prototypes/buildings/space/space-arthurian-pen-mk01'
-require 'prototypes/buildings/space/space-auog-paddock-mk01'
-require 'prototypes/buildings/space/space-bhoddos-culture-mk01'
-require 'prototypes/buildings/space/space-cadavericarum-mk01'
-require 'prototypes/buildings/space/space-cridren-enclosure-mk01'
-require 'prototypes/buildings/space/space-dingrits-mk01'
-require 'prototypes/buildings/space/space-ez-ranch-mk01'
-require 'prototypes/buildings/space/space-fish-farm-mk01'
-require 'prototypes/buildings/space/space-fwf-mk01'
-require 'prototypes/buildings/space/space-grod-swamp-mk01'
-require 'prototypes/buildings/space/space-kicalk-plantation-mk01'
-require 'prototypes/buildings/space/space-kmauts-enclosure-mk01'
-require 'prototypes/buildings/space/space-moss-farm-mk01'
-require 'prototypes/buildings/space/space-mukmoux-pasture-mk01'
-require 'prototypes/buildings/space/space-navens-culture-mk01'
-require 'prototypes/buildings/space/space-phadai-enclosure-mk01'
-require 'prototypes/buildings/space/space-phagnot-corral-mk01'
-require 'prototypes/buildings/space/space-prandium-lab-mk01'
-require 'prototypes/buildings/space/space-ralesia-plantation-mk01'
-require 'prototypes/buildings/space/space-rennea-plantation-mk01'
-require 'prototypes/buildings/space/space-sap-extractor-mk01'
-require 'prototypes/buildings/space/space-scrondrix-pen-mk01'
-require 'prototypes/buildings/space/space-seaweed-crop-mk01'
-require 'prototypes/buildings/space/space-sponge-culture-mk01'
-require 'prototypes/buildings/space/space-trits-reef-mk01'
-require 'prototypes/buildings/space/space-tuuphra-plantation-mk01'
-require 'prototypes/buildings/space/space-ulric-corral-mk01'
-require 'prototypes/buildings/space/space-vonix-den-mk01'
-require 'prototypes/buildings/space/space-vrauks-paddock-mk01'
-require 'prototypes/buildings/space/space-xenopen-mk01'
-require 'prototypes/buildings/space/space-xyhiphoe-pool-mk01'
-require 'prototypes/buildings/space/space-yaedols-culture-mk01'
-require 'prototypes/buildings/space/space-yotoi-aloe-orchard-mk01'
-require 'prototypes/buildings/space/space-zipir-reef-mk01'
-]]--
-
 require 'prototypes/buildings/py-drive'
 
 --(( FLUIDS ))--
@@ -501,7 +463,7 @@ require 'prototypes/creatures/ocula'
 require 'prototypes/creatures/ulric-man'
 
 Biofluid = {}
-require 'scripts/biofluid/biofluid-prototypes'
+require 'scripts.biofluid.biofluid-prototypes'
 require 'prototypes/biofluid/gobachov'
 require 'prototypes/biofluid/huzu'
 require 'prototypes/biofluid/chorkok'

locale/en/caravan.cfg

@@ -18,6 +18,17 @@ starved=Starved
 wounded=Wounded
 idle=Idle
 
+[caravan-shared]
+open=Open __1__
+view-on-map=View on map
+current-action=Current action: __1__
+current-destination=__1__m from __2__
+
+[caravan-global-gui]
+caption=Caravan manager
+empty=This is the caravan manager. It will display all placed caravans and their current status.
+empty-2=Currently you have no caravans.
+
 [caravan-gui]
 add-outpost=+ Add destination
 add-action=+ Add action
@@ -28,15 +39,6 @@ favorite-foods-main=Favorite foods:\n__1__
 favorite-foods-sub=__1__ __2__ → __3__ actions
 wait=Wait until fulfilled
 hello-my-name-is=[font=default-bold]Hello, my name is: [color=255,210,73]__1__[/color][/font]
-caption=Caravan manager
-empty=This is the caravan manager. It will display all placed caravans and their current status.
-empty-2=Currently you have no caravans.
-open=Open __1__
-view-on-map=View on map
-current-action=Current action: __1__
-current-destination=__1__m from __2__
-more-items=__1__ more...
-the-inventory-is-empty=The inventory is empty.
 
 [caravan-actions]
 time-passed=Wait

migrations/2.0.7.lua

@@ -3,6 +3,7 @@ if global.farms then
 	global.farms = nil
 	global.indexed_farm_list = nil
 	rendering.clear('pyalienlife')
+	---@diagnostic disable-next-line: different-requires
 	require '__pyalienlife__/scripts/farming/farming.lua'
 	Farming.events.on_init()
 	for _, surface in pairs(game.surfaces) do

prototypes/biofluid/chorkok.lua

@@ -1,5 +1,3 @@
-local sounds = require('__base__/prototypes/entity/sounds')
-
 RECIPE {
     type = 'recipe',
     name = 'chorkok',
@@ -92,7 +90,8 @@ local animation = {
     }
 }
 
-data:extend{{
+---@as data.UnitPrototype
+local unit = {
     ai_settings = {do_separation = false, path_resolution_modifier = -2},
     type = 'unit',
     name = 'chorkok',
@@ -135,4 +134,6 @@ data:extend{{
     },
     map_color = {0, 0.5, 0},
     selection_priority = 51
-}}
+}
+
+data:extend{unit}

prototypes/biofluid/gobachov.lua

@@ -1,5 +1,3 @@
-local sounds = require('__base__/prototypes/entity/sounds')
-
 RECIPE {
     type = 'recipe',
     name = 'gobachov',
@@ -81,7 +79,8 @@ local animation = {
     }
 }
 
-data:extend{{
+---@as data.UnitPrototype
+local unit = {
     ai_settings = {do_separation = false, path_resolution_modifier = -2},
     type = 'unit',
     name = 'gobachov',
@@ -124,4 +123,6 @@ data:extend{{
     },
     map_color = {0, 0.5, 0},
     selection_priority = 51
-}}
+}
+
+data:extend{unit}

prototypes/biofluid/huzu.lua

@@ -1,5 +1,3 @@
-local sounds = require('__base__/prototypes/entity/sounds')
-
 RECIPE {
     type = 'recipe',
     name = 'huzu',
@@ -82,7 +80,8 @@ local animation = {
     }
 }
 
-data:extend{{
+---@as data.UnitPrototype
+local unit = {
     ai_settings = {do_separation = false, path_resolution_modifier = -2},
     type = 'unit',
     name = 'huzu',
@@ -125,4 +124,6 @@ data:extend{{
     },
     map_color = {0, 0.5, 0},
     selection_priority = 51
-}}
+}
+
+data:extend{unit}