removing conditional requires everywhere

control.lua

@@ -304,9 +304,6 @@ local function onConfigChanged()
     upgraded, natives = upgrade.attempt(natives)
     if upgraded and onModSettingsChange(nil) then
 	rebuildMap()
-	if natives.newEnemies then
-	    rebuildNativeTables(natives, game.surfaces[1], game.create_random_generator(natives.enemySeed))
-	end
 
 	-- clear pending chunks, will be added when loop runs below
 	global.pendingChunks = {}
@@ -324,6 +321,9 @@ local function onConfigChanged()
 
 	processPendingChunks(natives, map, surface, pendingChunks, tick, game.forces.enemy.evolution_factor, true)
     end
+    if natives.newEnemies then
+	rebuildNativeTables(natives, game.surfaces[1], game.create_random_generator(natives.enemySeed))
+    end
 end
 
 script.on_nth_tick(INTERVAL_PROCESS,

data-final-fixes.lua

@@ -1,22 +1,40 @@
 local vanillaBuildings = require("prototypes/buildings/UpdatesVanilla")
 
+local neutral = require("prototypes/Neutral")
+local acid = require("prototypes/Acid")
+local physical = require("prototypes/Physical")
+local suicide = require("prototypes/Suicide")
+local fire = require("prototypes/Fire")
+local electric = require("prototypes/Electric")
+local nuclear = require("prototypes/Nuclear")
+local inferno = require("prototypes/Inferno")
+local fast = require("prototypes/Fast")
+local troll = require("prototypes/Troll")
+-- require("prototypes/Decaying")
+-- require("prototypes/Poison")
+-- require("prototypes/Undying")
+local spawner = require("prototypes/Spawner")
+local wasp = require("prototypes/Wasp")
+local laser = require("prototypes/Laser")
+
 if settings.startup["rampant-newEnemies"].value then
-    require("prototypes/Neutral")
-    require("prototypes/Acid")
-    require("prototypes/Physical")
-    require("prototypes/Suicide")
-    require("prototypes/Fire")
-    require("prototypes/Electric")
-    require("prototypes/Nuclear")
-    require("prototypes/Inferno")
-    require("prototypes/Fast")
-    require("prototypes/Troll")
+
+    neutral.addFaction()
+    acid.addFaction()
+    physical.addFaction()
+    suicide.addFaction()
+    fire.addFaction()
+    electric.addFaction()
+    nuclear.addFaction()
+    inferno.addFaction()
+    fast.addFaction()
+    troll.addFaction()
     -- require("prototypes/Decaying")
     -- require("prototypes/Poison")
     -- require("prototypes/Undying")
-    require("prototypes/Spawner")
-    require("prototypes/Wasp")
-    require("prototypes/Laser")
+    spawner.addFaction()
+    wasp.addFaction()
+    laser.addFaction()
 
     for _, unitSpawner in pairs(data.raw["unit-spawner"]) do
 	if (unitSpawner.name ~= "biter-spawner") then

data-updates.lua

@@ -3,6 +3,9 @@ local bobsUpdates = require("prototypes/utils/UpdatesBobs")
 local NEUpdates = require("prototypes/utils/UpdatesNE")
 local constants = require("libs/Constants")
 
+local attackBobs = require("prototypes/utils/AttackBobs")
+local attackNE = require("prototypes/utils/AttackNE")
+
 if settings.startup["rampant-removeBloodParticles"].value then
     local explosions = data.raw["explosion"]
 
@@ -16,14 +19,13 @@ if settings.startup["rampant-useDumbProjectiles"].value then
 
     local option = settings.startup["bobmods-enemies-enableartifacts"]
     if option then
-
-    	require("prototypes/utils/AttackBobs")
+	attackBobs.addAttacks()
     	bobsUpdates.useDumbProjectiles()
     end
 
     option = settings.startup["NE_Difficulty"]
     if option then
-    	require("prototypes/utils/AttackNE")
+	attackNE.addAttacks()
 	NEUpdates.useDumbProjectiles()
     	if settings.startup["rampant-useNEUnitLaunchers"].value then
     	    NEUpdates.useNEUnitLaunchers()

libs/ChunkUtils.lua

@@ -369,6 +369,8 @@ end
 function chunkUtils.analyzeChunk(chunk, natives, surface, map)    
     local playerObjects = chunkUtils.scorePlayerBuildings(surface, map, natives)
     setPlayerBaseGenerator(map, chunk, playerObjects)
+    local resources = surface.count_entities_filtered(map.countResourcesQuery) * RESOURCE_NORMALIZER
+    setResourceGenerator(map, chunk, resources)
 end
 
 function chunkUtils.createChunk(topX, topY)