Merge pull request #44 from JohnTheCoolingFan/dev

1.1.27
JohnTheCoolingFan · Dec 29, 2020 · 55fece8 · 55fece8
2 parents b966c76 + 2b580d3
commit 55fece8
Show file tree

Hide file tree

Showing 28 changed files with 27 additions and 1 deletion.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.27
+Date: 29.12.2020
+  Graphics:
+    - Updated graphics for MOX reactor and Industrial reactor.
+    - Added remnants for MOX reactor.
+---------------------------------------------------------------------------------------------------
 Version: 1.1.26
 Date: 24.11.2020
   Major Features:

diff --git a/data.lua b/data.lua
@@ -1,11 +1,13 @@
 require("prototypes.item.items")
+require('prototypes.entity.remnants')
 require("prototypes.entity.entities")
 require("prototypes.entity.projectiles")
 require("prototypes.recipe.recipes")
 require("prototypes.technology.technology")
 require("prototypes.categories.fuel-category")
 require("prototypes.categories.recipe-category")
 
+-- TODO: add remnants (MOX reactor)
 -- TODO: Support for Schall Uranium Processing (https://mods.factorio.com/mod/PlutoniumEnergy/discussion/5de1876b082e2b000b966564) (https://mods.factorio.com/mod/SchallUraniumProcessing)
 --       I have and idea to make PE's recipes similar to SUP's recipes.
 -- TODO: Support for SChall Artillery (https://mods.factorio.com/mod/SchallArtillery)
diff --git a/graphics/entity/MOX-reactor/MOX-reactor-connect-patches-heated.png b/graphics/entity/MOX-reactor/MOX-reactor-connect-patches-heated.png
diff --git a/graphics/entity/MOX-reactor/MOX-reactor-connect-patches.png b/graphics/entity/MOX-reactor/MOX-reactor-connect-patches.png
diff --git a/graphics/entity/MOX-reactor/MOX-reactor-lights-color.png b/graphics/entity/MOX-reactor/MOX-reactor-lights-color.png
diff --git a/graphics/entity/MOX-reactor/MOX-reactor-pipes-heated.png b/graphics/entity/MOX-reactor/MOX-reactor-pipes-heated.png
diff --git a/graphics/entity/MOX-reactor/MOX-reactor-pipes.png b/graphics/entity/MOX-reactor/MOX-reactor-pipes.png
diff --git a/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches-heated.png b/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches-heated.png
diff --git a/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches.png b/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches.png
diff --git a/graphics/entity/MOX-reactor/hr-MOX-reactor-lights-color.png b/graphics/entity/MOX-reactor/hr-MOX-reactor-lights-color.png
diff --git a/graphics/entity/MOX-reactor/hr-MOX-reactor-pipes-heated.png b/graphics/entity/MOX-reactor/hr-MOX-reactor-pipes-heated.png
diff --git a/graphics/entity/MOX-reactor/hr-MOX-reactor-pipes.png b/graphics/entity/MOX-reactor/hr-MOX-reactor-pipes.png
diff --git a/graphics/entity/MOX-reactor/hr-reactor-lights-grayscale.png b/graphics/entity/MOX-reactor/hr-reactor-lights-grayscale.png
diff --git a/graphics/entity/MOX-reactor/hr-reactor-shadow.png b/graphics/entity/MOX-reactor/hr-reactor-shadow.png
diff --git a/graphics/entity/MOX-reactor/hr-reactor.png b/graphics/entity/MOX-reactor/hr-reactor.png
diff --git a/graphics/entity/MOX-reactor/reactor-lights-grayscale.png b/graphics/entity/MOX-reactor/reactor-lights-grayscale.png
diff --git a/graphics/entity/MOX-reactor/reactor-shadow.png b/graphics/entity/MOX-reactor/reactor-shadow.png
diff --git a/graphics/entity/MOX-reactor/reactor.png b/graphics/entity/MOX-reactor/reactor.png
diff --git a/graphics/entity/MOX-reactor/remnants/MOX-reactor-remnants.png b/graphics/entity/MOX-reactor/remnants/MOX-reactor-remnants.png
diff --git a/graphics/entity/MOX-reactor/remnants/hr-MOX-reactor-remnants.png b/graphics/entity/MOX-reactor/remnants/hr-MOX-reactor-remnants.png
diff --git a/graphics/entity/industrial-reactor/hr-industrial-reactor-A-light.png b/graphics/entity/industrial-reactor/hr-industrial-reactor-A-light.png
diff --git a/graphics/entity/industrial-reactor/hr-industrial-reactor-B-light.png b/graphics/entity/industrial-reactor/hr-industrial-reactor-B-light.png
diff --git a/graphics/entity/industrial-reactor/hr-industrial-reactor-C-light.png b/graphics/entity/industrial-reactor/hr-industrial-reactor-C-light.png
diff --git a/graphics/entity/industrial-reactor/industrial-reactor-A-light.png b/graphics/entity/industrial-reactor/industrial-reactor-A-light.png
diff --git a/graphics/entity/industrial-reactor/industrial-reactor-B-light.png b/graphics/entity/industrial-reactor/industrial-reactor-B-light.png
diff --git a/graphics/entity/industrial-reactor/industrial-reactor-C-light.png b/graphics/entity/industrial-reactor/industrial-reactor-C-light.png
diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "PlutoniumEnergy",
-    "version": "1.1.26",
+    "version": "1.1.27",
     "title": "Plutonium Energy",
     "author": "JohnTheCoolingFan",
     "contact": "https://discord.gg/grHVhE2",

diff --git a/prototypes/entity/remnants.lua b/prototypes/entity/remnants.lua
@@ -0,0 +1,18 @@
+require 'util'
+
+local remnants = {}
+
+
+local MOX_reactor = util.table.deepcopy(data.raw['corpse']['nuclear-reactor-remnants'])
+
+MOX_reactor.name = 'MOX-reactor-remnants'
+MOX_reactor.icon = '__PlutoniumEnergy__/graphics/icons/MOX-reactor.png'
+MOX_reactor.animation.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/remnants/MOX-reactor-remnants.png'
+MOX_reactor.animation.scale = 0.6
+MOX_reactor.animation.hr_version.filename = '__PlutoniumEnergy__/graphics/entity/MOX-reactor/remnants/hr-MOX-reactor-remnants.png'
+MOX_reactor.animation.hr_version.scale = 0.3
+
+table.insert(remnants, MOX_reactor)
+
+
+data:extend(remnants)