Merge pull request #28 from JohnTheCoolingFan/dev

1.1.11

Author: JohnTheCoolingFan

changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.11
+Date: 04.06.2020
+  Fixes:
+    - Fixed loading error that occurs when using PE and some other mods.
+---------------------------------------------------------------------------------------------------
 Version: 1.1.10
 Date: 24.04.2020
   Fixes:

info.json

@@ -1,15 +1,15 @@
 {
-"name": "PlutoniumEnergy",
-"version": "1.1.10",
-"title": "Plutonium Energy",
-"author": "JohnTheCoolingFan",
-"contact": "https://discord.gg/grHVhE2",
-"homepage": "https://discord.gg/grHVhE2",
-"dependencies": [
-    "base >= 0.18.21",
-    "? AtomicArtillery",
-    "? SchallUraniumProcessing"
-],
-"description": "Adds processing of plutonium, excess product from nuclear reaction. Plutonium can be used to create ammo (even plutonium atomic bomb) and to create energy as MOX fuel.",
-"factorio_version": "0.18"
+    "name": "PlutoniumEnergy",
+    "version": "1.1.11",
+    "title": "Plutonium Energy",
+    "author": "JohnTheCoolingFan",
+    "contact": "https://discord.gg/grHVhE2",
+    "homepage": "https://discord.gg/grHVhE2",
+    "dependencies": [
+        "base >= 0.18.21",
+        "? AtomicArtillery",
+        "? SchallUraniumProcessing"
+    ],
+    "description": "Adds processing of plutonium, excess product from nuclear reaction. Plutonium can be used to create ammo (even plutonium atomic bomb) and to create energy as MOX fuel.",
+    "factorio_version": "0.18"
 }

prototypes/entity/entities.lua

@@ -115,15 +115,17 @@ industrial_reactor.crafting_categories = {"alpha-decay", "nucleosynthesis", "exc
 industrial_reactor.module_specification.module_slots = 4
 industrial_reactor.energy_usage = "420kW"
 
-industrial_reactor.working_visualisations[1].light.color = {r = 0.0, g = 0.15, b = 1.0}
-
-local indreact_anim = industrial_reactor.animation.layers
-indreact_anim[1].filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/industrial-reactor-C-light.png"
-indreact_anim[1].hr_version.filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/hr-industrial-reactor-C-light.png"
-indreact_anim[2].filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/industrial-reactor-B-light.png"
-indreact_anim[2].hr_version.filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/hr-industrial-reactor-B-light.png"
-indreact_anim[3].filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/industrial-reactor-A-light.png"
-indreact_anim[3].hr_version.filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/hr-industrial-reactor-A-light.png"
+industrial_reactor.working_visualisations[1] = {effect="uranium-glow", light={intensity=0.6, size=9.9, shift={0.0, 0.0}, color={r=0.0, g=0.15, b=1.0}}}
+
+if industrial_reactor.animation then
+    local indreact_anim = industrial_reactor.animation.layers
+    indreact_anim[1].filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/industrial-reactor-C-light.png"
+    indreact_anim[1].hr_version.filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/hr-industrial-reactor-C-light.png"
+    indreact_anim[2].filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/industrial-reactor-B-light.png"
+    indreact_anim[2].hr_version.filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/hr-industrial-reactor-B-light.png"
+    indreact_anim[3].filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/industrial-reactor-A-light.png"
+    indreact_anim[3].hr_version.filename = "__PlutoniumEnergy__/graphics/entity/industrial-reactor/hr-industrial-reactor-A-light.png"
+end
 table.insert(entities, industrial_reactor)
 
 data:extend(entities)