change base accumulator later to allow other mods to copy it without …

…issues

Advanced-Electric-Revamped-v16/data-final-fixes.lua

@@ -39,4 +39,9 @@ if mods["Krastorio2"] then
 	}
 	mul = settings.startup["advanced-electric-multiplier-ultimate-solar"].value
 	data.raw["solar-panel"]["ultimate-solar"].production = numberstringmultiplicator(data.raw["solar-panel"]["solar-panel"]["production"], mul)
+end
+
+if mods["FactorioExtended-Plus-Power"] == nil then
+	data.raw["accumulator"]["accumulator"].next_upgrade = "advanced-accumulator"
+	data.raw["solar-panel"]["solar-panel"].next_upgrade = "advanced-solar"
 end

Advanced-Electric-Revamped-v16/data.lua

@@ -110,10 +110,6 @@ end
 
 data.raw["accumulator"]["accumulator"].fast_replaceable_group = "accumulator"
 data.raw["solar-panel"]["solar-panel"].fast_replaceable_group = "solar-panel"
-if mods["FactorioExtended-Plus-Power"] == nil then
-	data.raw["accumulator"]["accumulator"].next_upgrade = "advanced-accumulator"
-	data.raw["solar-panel"]["solar-panel"].next_upgrade = "advanced-solar"
-end
 
 if mods["5dim_core"] then
 	require("prototypes.item-group-5dim")

Advanced-Electric-Revamped-v16/info.json

@@ -1,11 +1,18 @@
 {
- "name": "Advanced-Electric-Revamped-v16",
- "version": "0.7.0",
- "title": "Advanced Solar High Resolution",
- "contact": "",
- "author": "LsHallo",
- "homepage": "https://forums.factorio.com/viewtopic.php?f=190&t=59398",
- "description": "Adds higher tiers of solar panels(600kW, 6MW, 60MW) and accumulators(50MJ, 500MJ, 5GJ). Values configurable.",
- "dependencies": ["base >= 2.0.0"],
- "factorio_version": "2.0"
+  "name": "Advanced-Electric-Revamped-v16",
+  "version": "0.7.1",
+  "title": "Advanced Solar High Resolution",
+  "contact": "",
+  "author": "LsHallo",
+  "homepage": "https://forums.factorio.com/viewtopic.php?f=190&t=59398",
+  "description": "Adds higher tiers of solar panels(600kW, 6MW, 60MW) and accumulators(50MJ, 500MJ, 5GJ). Values configurable.",
+  "dependencies": [
+    "base >= 2.0.0",
+    "?space-age",
+    "!Advanced-Solar-and-Accumulator",
+    "!Advanced-Solar",
+    "!skan-advanced-solar",
+    "!here-comes-the-sun"
+  ],
+  "factorio_version": "2.0"
 }