Merge pull request #43 from JohnTheCoolingFan/dev

1.1.26
JohnTheCoolingFan · Nov 24, 2020 · b966c76 · b966c76
2 parents fe833fb + dcf1baf
commit b966c76
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.26
+Date: 24.11.2020
+  Major Features:
+    - Update for Factorio 1.1
+---------------------------------------------------------------------------------------------------
 Version: 1.1.25
 Date: 24.11.2020
   Fixes:

diff --git a/info.json b/info.json
@@ -1,12 +1,12 @@
 {
     "name": "PlutoniumEnergy",
-    "version": "1.1.25",
+    "version": "1.1.26",
     "title": "Plutonium Energy",
     "author": "JohnTheCoolingFan",
     "contact": "https://discord.gg/grHVhE2",
     "homepage": "https://discord.gg/grHVhE2",
     "dependencies": [
-        "base >= 1.0.0",
+        "base >= 1.1.0",
         "? AtomicArtillery >= 0.2.1",
         "? SchallUraniumProcessing",
         "? SchallArtillery >= 1.0.0",
@@ -15,5 +15,5 @@
         "? AtomicRocketScreenBurn"
     ],
     "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": "1.0"
+    "factorio_version": "1.1"
 }
diff --git a/prototypes/entity/entities.lua b/prototypes/entity/entities.lua
@@ -1,3 +1,5 @@
+-- TODO: redo reactor graphics with new glow.
+
 require "util"
 local entities = {}
 
@@ -26,12 +28,12 @@ lower_layer.hr_version.filename = "__PlutoniumEnergy__/graphics/entity/MOX-react
 lower_layer.hr_version.width = 192
 lower_layer.hr_version.height = 192
 
-MOX_reactor.heat_lower_layer_picture.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-pipes-heated.png'
-MOX_reactor.heat_lower_layer_picture.width = 96
-MOX_reactor.heat_lower_layer_picture.height = 96
-MOX_reactor.heat_lower_layer_picture.hr_version.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-pipes-heated.png'
-MOX_reactor.heat_lower_layer_picture.hr_version.width = 192
-MOX_reactor.heat_lower_layer_picture.hr_version.height = 192
+MOX_reactor.heat_lower_layer_picture.layers[1].filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-pipes-heated.png'
+MOX_reactor.heat_lower_layer_picture.layers[1].width = 96
+MOX_reactor.heat_lower_layer_picture.layers[1].height = 96
+MOX_reactor.heat_lower_layer_picture.layers[1].hr_version.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-pipes-heated.png'
+MOX_reactor.heat_lower_layer_picture.layers[1].hr_version.width = 192
+MOX_reactor.heat_lower_layer_picture.layers[1].hr_version.height = 192
 
 MOX_reactor.picture.layers[1].scale = 0.6
 MOX_reactor.picture.layers[1].shift = util.by_pixel(-4, -6)
@@ -45,7 +47,7 @@ MOX_reactor.working_light_picture.scale = 0.6
 MOX_reactor.working_light_picture.hr_version.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-lights-color.png"
 MOX_reactor.working_light_picture.hr_version.scale = 0.3
 
-MOX_reactor.light.color = {r = 0.0, g = 0.82, b = 0.9}
+--MOX_reactor.light.color = {r = 0.0, g = 0.82, b = 0.9}
 
 MOX_reactor.heat_buffer.connections = {
     {
@@ -82,9 +84,9 @@ MOX_reactor.heat_buffer.connections = {
     }
 }
 
-MOX_reactor.heat_buffer.heat_picture.scale = 0.6
-MOX_reactor.heat_buffer.heat_picture.hr_version.scale = 0.3
-MOX_reactor.heat_buffer.heat_glow.scale = 0.6
+MOX_reactor.heat_buffer.heat_picture.layers[1].scale = 0.6
+MOX_reactor.heat_buffer.heat_picture.layers[1].hr_version.scale = 0.3
+--MOX_reactor.heat_buffer.heat_glow.scale = 0.6
 
 local patches_pic_con = MOX_reactor.connection_patches_connected.sheet
 patches_pic_con.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-connect-patches.png"
@@ -95,12 +97,12 @@ patches_pic_discon.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/M
 patches_pic_discon.hr_version.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches.png"
 
 local patches_pic_con_heat = MOX_reactor.heat_connection_patches_connected.sheet
-patches_pic_con_heat.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-connect-patches-heated.png'
-patches_pic_con_heat.hr_version.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches-heated.png'
+patches_pic_con_heat.layers[1].filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-connect-patches-heated.png'
+patches_pic_con_heat.layers[1].hr_version.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches-heated.png'
 
 local patches_pic_discon_heat = MOX_reactor.heat_connection_patches_disconnected.sheet
-patches_pic_discon_heat.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-connect-patches-heated.png'
-patches_pic_discon_heat.hr_version.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches-heated.png'
+patches_pic_discon_heat.layers[1].filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-connect-patches-heated.png'
+patches_pic_discon_heat.layers[1].hr_version.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches-heated.png'
 table.insert(entities, MOX_reactor)