Merge pull request #351 from pyanodon/Frozen

Frozen

changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.1.19
+Date: 2024-1-31
+  Changes:
+    - Fixed that the fix that beacon and diet beacon would override farms being disabled without modules would break the ability to start new save files
+---------------------------------------------------------------------------------------------------
 Version: 2.1.18
 Date: 2024-1-31
   Changes:

control.lua

@@ -1,5 +1,3 @@
-farms = {}
-
 _G.gui_events = {
 	[defines.events.on_gui_click] = {},
 	[defines.events.on_gui_confirmed] = {},
@@ -43,9 +41,6 @@ end
 script.on_configuration_changed(init)
 script.on_init(function()
 	init()
-	if game.active_mods["pyalienlife"] then
-		farms = require("__pyalienlife__/scripts/farming/farm-building-list")
-	end
 	for _, interface in pairs{'silo_script', 'better-victory-screen'} do
 		if remote.interfaces[interface] and remote.interfaces[interface]['set_no_victory'] then
 			remote.call(interface, 'set_no_victory', true)

info.json

@@ -1,6 +1,6 @@
 {
   "name": "pycoalprocessing",
-  "version": "2.1.18",
+  "version": "2.1.19",
   "factorio_version": "1.1",
   "title": "Pyanodons Coal Processing",
   "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",

scripts/beacons.lua

@@ -1,6 +1,51 @@
 Beacons = {}
 Beacons.events = {}
 
+local farm_buildings = {
+	['antelope-enclosure'] = 'animal',
+	['arqad-hive'] = 'animal',
+	['arthurian-pen'] = 'animal',
+	['auog-paddock'] = 'animal',
+	['cridren-enclosure'] = 'plant',
+	['dhilmos-pool'] = 'animal',
+	['dingrits-pack'] = 'animal',
+	['fish-farm'] = 'animal',
+	['kmauts-enclosure'] = 'animal',
+	['mukmoux-pasture'] = 'animal',
+	['phadai-enclosure'] = 'animal',
+	['phagnot-corral'] = 'animal',
+	['prandium-lab'] = 'animal',
+	['ez-ranch'] = 'animal',
+	['rc'] = 'animal',
+	['scrondrix-pen'] = 'animal',
+	['simik-den'] = 'animal',
+	['trits-reef'] = 'animal',
+	['ulric-corral'] = 'animal',
+	['vonix-den'] = 'animal',
+	['vrauks-paddock'] = 'animal',
+	['xenopen'] = 'animal',
+	['xyhiphoe-pool'] = 'animal',
+	['zipir-reef'] = 'animal',
+	['cadaveric-arum'] = 'plant',
+	['fwf'] = 'plant',
+	['grods-swamp'] = 'plant',
+	['guar-gum-plantation'] = 'plant',
+	['kicalk-plantation'] = 'plant',
+	['moondrop-greenhouse'] = 'plant',
+	['moss-farm'] = 'plant',
+	['ralesia-plantation'] = 'plant',
+	['rennea-plantation'] = 'plant',
+	['sap-extractor'] = 'plant',
+	['seaweed-crop'] = 'plant',
+	['sponge-culture'] = 'plant',
+	['tuuphra-plantation'] = 'plant',
+	['yotoi-aloe-orchard'] = 'plant',
+	['bhoddos-culture'] = 'fungi',
+	['fawogae-plantation'] = 'fungi',
+	['navens-culture'] = 'fungi',
+	['yaedols-culture'] = 'fungi',
+}
+
 local our_beacons = {}
 for i = 1, 5 do
 	for j = 1, 5 do
@@ -11,7 +56,7 @@ end
 
 Beacons.events.init = function()
 	global.beacon_interference_icons = global.beacon_interference_icons or {}
-	global.farms = global.farms or farms
+	global.farms = global.farms or farm_buildings
 end
 
 local function enable_entity(entity)