Merge pull request #15 from JohnTheCoolingFan/dev

JohnTheCoolingFan · web-flow · commit 1887ca2520cc · 2019-09-21T15:44:27.000+03:00
Version 1.1.6
diff --git a/README.md b/README.md
@@ -11,14 +11,15 @@ Plutonium nuclear fuel and weapons. Full description coming soon.
 *   Traditional Chinese / 正體中文 (zh-TW) by [Shallfalke](https://mods.factorio.com/user/Schallfalke)
 *   Simplified Chinese / 简体中文 (zh-CN) by [Shallfalke](https://mods.factorio.com/user/Schallfalke)
 
-### Join my [Discord server](https://discord.gg/grHVhE2) to get latest news about my mods and just to talk with each other. I'll wait for you there!
+### Join my [Discord server](https://discord.gg/grHVhE2) to get latest news about my mods and just to talk with each other. It's mainly Russian, but everyone is welcome.
+[![Discord server](https://discordapp.com/api/guilds/370167294439063564/widget.png?style=banner2)](https://discord.gg/grHVhE2)
 You can support me on [Patreon](https://www.patreon.com/JohnTheCoolingFan). Your support is very important for me!
 
 #### Other mods about nuclear energy:
 
-*   [Realistic Reactors](https://mods.factorio.com/mod/RealisticReactors) - Impressing mod that makes reactors more complicated and realistic. Has support for others mods, including Plutonium Energy.
+*   [Realistic Reactors](https://mods.factorio.com/mod/RealisticReactors) - Impressing mod that makes reactors more complicated and realistic. Has support for other mods, including Plutonium Energy.
 *   [RITEG](https://mods.factorio.com/mod/RITEG) - Good mod that adds [RITEGs](https://en.wikipedia.org/wiki/Radioisotope_thermoelectric_generator)
-*   [Realistic Reactor Glow](https://mods.factorio.com/mod/RealisticReactorGlow) - Changes reactor's glow from green to cyan (Similar to how MOX reactor glows)
+*   [Realistic Reactor Glow](https://mods.factorio.com/mod/RealisticReactorGlow) - Changes reactor's glow from green to more realistic cyan (Similar to how MOX reactor glows)
 *   [Advanced Atomics mod](https://mods.factorio.com/mod/Advanced-Atomics) - Discontinued mod that adds a lot of uranium and plutonium stuff, supported in Plutonium Energy.
 
 Other my mods:
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.6
+Date: 21.09.2019
+  Fixes:
+    - Fixed heated MOX reactor graphics
+---------------------------------------------------------------------------------------------------
 Version: 1.1.5
 Date: 21.08.2019
   Minor Features:
diff --git a/data.lua b/data.lua
@@ -5,6 +5,3 @@ require("prototypes.recipe.recipes")
 require("prototypes.technology.technologies")
 require("prototypes.categories.fuel-category")
 require("prototypes.categories.recipe-category")
-
--- TODO
--- Add option to disable thath recipe from 1.1.3 and 1.1.4
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-pipes-heated.png b/graphics/entity/MOX-reactor/MOX-reactor-pipes-heated.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-pipes-heated.png b/graphics/entity/MOX-reactor/hr-MOX-reactor-pipes-heated.png
diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
 "name": "PlutoniumEnergy",
-"version": "1.1.5",
+"version": "1.1.6",
 "title": "Plutonium Energy",
 "author": "JohnTheCoolingFan",
 "contact": "https://discord.gg/grHVhE2",
diff --git a/prototypes/entity/entities.lua b/prototypes/entity/entities.lua
@@ -1,33 +1,51 @@
 require "util"
 local entities = {}
 
+-- TODO: Fix heated reactor graphics
 local MOX_reactor = util.table.deepcopy(data.raw["reactor"]["nuclear-reactor"])
+
 MOX_reactor.name = "MOX-reactor"
 MOX_reactor.icon = "__PlutoniumEnergy__/graphics/icons/MOX-reactor.png"
 MOX_reactor.minable.result = "MOX-reactor"
-MOX_reactor.minable.mining_time = 1
 MOX_reactor.max_health = 400
+
 MOX_reactor.consumption = "20MW"
 MOX_reactor.energy_source.fuel_category = "PE-MOX"
+
 MOX_reactor.collision_box = {{-1.2, -1.2}, {1.2, 1.2}}
 MOX_reactor.selection_box = {{-1.45, -1.45}, {1.45, 1.45}}
+
 MOX_reactor.next_upgrade = nil
+
 local lower_layer = MOX_reactor.lower_layer_picture
 lower_layer.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-pipes.png"
 lower_layer.width = 96
 lower_layer.height = 92
 lower_layer.hr_version.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-pipes.png"
 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.picture.layers[1].scale = 0.6
+MOX_reactor.picture.layers[1].shift = util.by_pixel(-4, -6)
 MOX_reactor.picture.layers[1].hr_version.scale = 0.3
+MOX_reactor.picture.layers[1].hr_version.shift = util.by_pixel(-3, -7)
 MOX_reactor.picture.layers[2].scale = 0.6
 MOX_reactor.picture.layers[2].hr_version.scale = 0.3
+
 MOX_reactor.working_light_picture.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-lights-color.png"
 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.15, b = 1.0}
+
+MOX_reactor.light.color = {r = 0.0, g = 0.82, b = 0.9}
+
 MOX_reactor.heat_buffer.connections = {
     {
         position = {-1, -1},
@@ -62,26 +80,41 @@ MOX_reactor.heat_buffer.connections = {
         direction = defines.direction.west
     }
 }
+
+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
+
 local patches_pic_con = MOX_reactor.connection_patches_connected.sheet
 patches_pic_con.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-connect-patches.png"
-patches_pic_con.variation_count = 12
 patches_pic_con.hr_version.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches.png"
-patches_pic_con.hr_version.variation_count = 12
+
 local patches_pic_discon = MOX_reactor.connection_patches_disconnected.sheet
 patches_pic_discon.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/MOX-reactor-connect-patches.png"
-patches_pic_discon.variation_count = 12
 patches_pic_discon.hr_version.filename = "__PlutoniumEnergy__/graphics/entity/MOX-reactor/hr-MOX-reactor-connect-patches.png"
-patches_pic_discon.hr_version.variation_count = 12
+
+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'
+
+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'
 table.insert(entities, MOX_reactor)
 
+
 local industrial_reactor = util.table.deepcopy(data.raw["assembling-machine"]["centrifuge"])
+
 industrial_reactor.name = "industrial-reactor"
 industrial_reactor.icon = "__PlutoniumEnergy__/graphics/icons/industrial-reactor.png"
+industrial_reactor.minable.result = "industrial-reactor"
+
 industrial_reactor.crafting_categories = {"alpha-decay", "nucleosynthesis", "excess-neutron-capture"}
-industrial_reactor.energy_usage = "420kW"
 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}
-industrial_reactor.minable.result = "industrial-reactor"
+
 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"
diff --git a/prototypes/entity/projectiles.lua b/prototypes/entity/projectiles.lua
@@ -5,13 +5,15 @@ plutonium_cannon_shell_explosion.name = "plutonium-cannon-shell-explosion"
 plutonium_cannon_shell_explosion.animations[1].tint = {r = 0.1, g = 0.9, b = 0.7}
 table.insert(projectiles, plutonium_cannon_shell_explosion)
 
+
 local plutonium_cannon_explosion = util.table.deepcopy(data.raw["explosion"]["explosion"])
 plutonium_cannon_explosion.name = "plutonium-cannon-explosion"
 for k, v in pairs(plutonium_cannon_explosion.animations) do
     v.tint = {r = 0.1, g = 0.9, b = 0.7}
 end
 table.insert(projectiles, plutonium_cannon_explosion)
 
+
 local plutonium_atomic_rocket = util.table.deepcopy(data.raw["projectile"]["atomic-rocket"])
 plutonium_atomic_rocket.name = "plutonium-atomic-rocket"
 plutonium_atomic_rocket.action.action_delivery.target_effects[1].repeat_count = 140
@@ -20,18 +22,23 @@ plutonium_atomic_rocket.action.action_delivery.target_effects[5].action.repeat_c
 plutonium_atomic_rocket.action.action_delivery.target_effects[5].action.radius = 50
 table.insert(projectiles, plutonium_atomic_rocket)
 
+
 if mods["AtomicArtillery"] then
     local plutonium_atomic_artillery_projectile = util.table.deepcopy(data.raw["artillery-projectile"]["atomic-artillery-projectile"])
+
     plutonium_atomic_artillery_projectile.name = "plutonium-atomic-artillery-projectile"
+
     plutonium_atomic_artillery_projectile.picture.filename = "__PlutoniumEnergy__/graphics/entity/plutonium-artillery-projectile/hr-plutonium-atomic-shell.png"
     plutonium_atomic_artillery_projectile.chart_picture.filename = "__PlutoniumEnergy__/graphics/entity/plutonium-artillery-projectile/plutonium-atomic-artillery-shoot-map-visualization.png"
+
     plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[1].repeat_count = 140
     plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[3].damage.amount = 2100
     plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[5].action.repeat_count = 5600
     plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[5].action.radius = 70
     plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[5].action.action_delivery.projectile = "plutonium-atomic-artillery-wave"
     table.insert(projectiles, plutonium_atomic_artillery_projectile)
 
+
     local plutonium_atomic_artillery_wave = util.table.deepcopy(data.raw["projectile"]["atomic-artillery-wave"])
     plutonium_atomic_artillery_wave.name = "plutonium-atomic-artillery-wave"
     plutonium_atomic_artillery_wave.action[2].action_delivery.target_effects.damage.amount = 5600
diff --git a/prototypes/item/ammo.lua b/prototypes/item/ammo.lua
@@ -1,7 +1,9 @@
 if mods["AtomicArtillery"] then
     local plutonium_atomic_artillery_shell = util.table.deepcopy(data.raw["ammo"]["atomic-artillery-shell"])
+
     plutonium_atomic_artillery_shell.name = "plutonium-atomic-artillery-shell"
     plutonium_atomic_artillery_shell.icon = "__PlutoniumEnergy__/graphics/icons/plutonium-atomic-artillery-shell.png"
+
     plutonium_atomic_artillery_shell.projectile = "plutonium-atomic-artillery-projectile"
     plutonium_atomic_artillery_shell.ammo_type.action.action_delivery.starting_speed = 1.1
     data:extend({plutonium_atomic_artillery_shell})
diff --git a/prototypes/recipe/ammo.lua b/prototypes/recipe/ammo.lua
@@ -2,7 +2,9 @@ local ammo_recipes = {}
 
 if mods["AtomicArtillery"] then
     local plutonium_atomic_artillery_shell = util.table.deepcopy(data.raw["recipe"]["atomic-artillery-shell"])
+
     plutonium_atomic_artillery_shell.name = "plutonium-atomic-artillery-shell"
+
     plutonium_atomic_artillery_shell.ingredients = {
         {"plutonium-atomic-bomb", 1},
         {"explosive-plutonium-cannon-shell", 3},
diff --git a/prototypes/recipe/recipes.lua b/prototypes/recipe/recipes.lua
@@ -6,13 +6,16 @@ local recipes = {}
 data.raw["recipe"]["kovarex-enrichment-process"].order = "r[uranium-processing]-d[kovarex-enrichment-process]"
 
 local advanced_nuclear_fuel_reprocessing = util.table.deepcopy(data.raw["recipe"]["nuclear-fuel-reprocessing"])
+
 advanced_nuclear_fuel_reprocessing.name = "advanced-nuclear-fuel-reprocessing"
+advanced_nuclear_fuel_reprocessing.icon = "__PlutoniumEnergy__/graphics/icons/advanced-nuclear-fuel-reprocessing.png"
+
 advanced_nuclear_fuel_reprocessing.enabled = false
+
 advanced_nuclear_fuel_reprocessing.ingredients = {{"used-up-uranium-fuel-cell", 10}}
 advanced_nuclear_fuel_reprocessing.energy_required = 100
 advanced_nuclear_fuel_reprocessing.results = {{name = "uranium-238", amount = 5}, {name = "PE-plutonium-239", amount = 2}}
-advanced_nuclear_fuel_reprocessing.order = "r[uranium-processing]-c[advanced-nuclear-fuel-reprocessing]"
-advanced_nuclear_fuel_reprocessing.icon = "__PlutoniumEnergy__/graphics/icons/advanced-nuclear-fuel-reprocessing.png"
+
 advanced_nuclear_fuel_reprocessing.order = "r[uranium-processing]-c[advanced-nuclear-fuel-reprocessing]"
 table.insert(recipes, advanced_nuclear_fuel_reprocessing)
 
diff --git a/prototypes/technology/technologies.lua b/prototypes/technology/technologies.lua
@@ -43,8 +43,8 @@ data:extend({
         icon_size = 128,
         effects = {
             {
-            	type = "unlock-recipe",
-            	recipe = "MOX-fuel"
+                type = "unlock-recipe",
+                recipe = "MOX-fuel"
             },
             {
                 type = "unlock-recipe",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "PlutoniumEnergy",`
`3`		`-"version": "1.1.5",`
	`3`	`+"version": "1.1.6",`
`4`	`4`	`"title": "Plutonium Energy",`
`5`	`5`	`"author": "JohnTheCoolingFan",`
`6`	`6`	`"contact": "https://discord.gg/grHVhE2",`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ data:extend({`
`43`	`43`	`icon_size = 128,`
`44`	`44`	`effects = {`
`45`	`45`	`{`
`46`		`- type = "unlock-recipe",`
`47`		`- recipe = "MOX-fuel"`
	`46`	`+ type = "unlock-recipe",`
	`47`	`+ recipe = "MOX-fuel"`
`48`	`48`	`},`
`49`	`49`	`{`
`50`	`50`	`type = "unlock-recipe",`