Merge pull request #33 from JohnTheCoolingFan/dev

1.1.16

changelog.txt

@@ -1,4 +1,11 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.16
+Date: 15.08.2020
+  Minor Features:
+    - Icon sprites are now mipmaps and 64x64 max size
+  Graphics:
+    - Fixed MOX reactor's heat pipes texture misalignment
+---------------------------------------------------------------------------------------------------
 Version: 1.1.15
 Date: 15.08.2020
   Minor Features:

data.lua

@@ -9,4 +9,3 @@ require("prototypes.categories.recipe-category")
 -- 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)
--- TODO: Remake icons for x64 size

info.json

@@ -1,6 +1,6 @@
 {
     "name": "PlutoniumEnergy",
-    "version": "1.1.15",
+    "version": "1.1.16",
     "title": "Plutonium Energy",
     "author": "JohnTheCoolingFan",
     "contact": "https://discord.gg/grHVhE2",

prototypes/entity/entities.lua

@@ -1,12 +1,12 @@
 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.icon_size = 32
+MOX_reactor.icon_size = 64
+MOX_reactor.icon_mipmaps = 4
 MOX_reactor.minable.result = "MOX-reactor"
 MOX_reactor.max_health = 400
 
@@ -108,7 +108,8 @@ local industrial_reactor = util.table.deepcopy(data.raw["assembling-machine"]["c
 
 industrial_reactor.name = "industrial-reactor"
 industrial_reactor.icon = "__PlutoniumEnergy__/graphics/icons/industrial-reactor.png"
-industrial_reactor.icon_size = 32
+industrial_reactor.icon_size = 64
+industrial_reactor.icon_mipmaps = 4
 industrial_reactor.minable.result = "industrial-reactor"
 
 industrial_reactor.crafting_categories = {"alpha-decay", "nucleosynthesis", "excess-neutron-capture"}

prototypes/item/ammo.lua

@@ -15,7 +15,8 @@ data:extend({
         type = "ammo",
         name = "plutonium-rounds-magazine",
         icon = "__PlutoniumEnergy__/graphics/icons/plutonium-rounds-magazine.png",
-        icon_size = 32,
+        icon_size = 64,
+        icon_mipmaps = 4,
         flags = {},
         ammo_type = {
             category = "bullet",
@@ -49,7 +50,8 @@ data:extend({
         type = "ammo",
         name = "plutonium-cannon-shell",
         icon = "__PlutoniumEnergy__/graphics/icons/plutonium-cannon-shell.png",
-        icon_size = 32,
+        icon_size = 64,
+        icon_mipmaps = 4,
         flags = {},
         ammo_type = {
             category = "cannon-shell",
@@ -78,7 +80,8 @@ data:extend({
         type = "ammo",
         name = "explosive-plutonium-cannon-shell",
         icon = "__PlutoniumEnergy__/graphics/icons/explosive-plutonium-cannon-shell.png",
-        icon_size = 32,
+        icon_size = 64,
+        icon_mipmaps = 4,
         flags = {},
         ammo_type = {
             category = "cannon-shell",
@@ -107,7 +110,8 @@ data:extend({
         type = "ammo",
         name = "plutonium-atomic-bomb",
         icon = "__PlutoniumEnergy__/graphics/icons/plutonium-atomic-bomb.png",
-        icon_size = 32,
+        icon_size = 64,
+        icon_mipmaps = 4,
         flags = {},
         ammo_type = {
             range_modifier = 5,

prototypes/item/items.lua

@@ -6,7 +6,8 @@ data:extend({
 		type = "item",
 		name = "PE-plutonium-239",
 		icon = "__PlutoniumEnergy__/graphics/icons/plutonium-239.png",
-		icon_size = 32,
+		icon_size = 64,
+        icon_mipmaps = 4,
 		flags = {},
 		subgroup = "intermediate-product",
 		order = "g[plutonium-239]",
@@ -16,7 +17,8 @@ data:extend({
 		type = "item",
 		name = "PE-plutonium-238",
 		icon = "__PlutoniumEnergy__/graphics/icons/plutonium-238.png",
-		icon_size = 32,
+		icon_size = 64,
+        icon_mipmaps = 4,
 		flags = {},
 		subgroup = "intermediate-product",
 		order = "g[plutonium-238]",
@@ -28,7 +30,8 @@ data:extend({
 		type = "item",
 		name = "MOX-fuel",
 		icon = "__PlutoniumEnergy__/graphics/icons/MOX-fuel.png",
-		icon_size = 32,
+		icon_size = 64,
+        icon_mipmaps = 4,
 		flags = {},
 		subgroup = "intermediate-product",
 		order = "r[uranium-processing]-b[MOX-fuel]",
@@ -41,7 +44,8 @@ data:extend({
 		type = "item",
 		name = "used-up-MOX-fuel",
 		icon = "__PlutoniumEnergy__/graphics/icons/used-up-MOX-fuel.png",
-		icon_size = 32,
+		icon_size = 64,
+        icon_mipmaps = 4,
 		flags = {},
 		subgroup = "intermediate-product",
 		order = "i[used-up-MOX-fuel]",
@@ -53,7 +57,8 @@ data:extend({
 		type = "item",
 		name = "MOX-reactor",
 		icon = "__PlutoniumEnergy__/graphics/icons/MOX-reactor.png",
-		icon_size = 32,
+		icon_size = 64,
+        icon_mipmaps = 4,
 		flags = {},
 		subgroup = "energy",
 		order = "f[nuclear-energy]-b[MOX-reactor]",
@@ -64,7 +69,8 @@ data:extend({
 		type = "item",
 		name = "industrial-reactor",
 		icon = "__PlutoniumEnergy__/graphics/icons/industrial-reactor.png",
-		icon_size = 32,
+		icon_size = 64,
+        icon_mipmaps = 4,
 		flags = {},
 		subgroup = "production-machine",
 		order = "g[industrial-reactor]",

prototypes/recipe/recipes.lua

@@ -25,7 +25,8 @@ local advanced_nuclear_fuel_reprocessing = util.table.deepcopy(data.raw["recipe"
 
 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.icon_size = 32
+advanced_nuclear_fuel_reprocessing.icon_size = 64
+advanced_nuclear_fuel_reprocessing.icon_mipamps = 4
 
 advanced_nuclear_fuel_reprocessing.enabled = false
 
@@ -51,7 +52,8 @@ data:extend({
         category = "nucleosynthesis",
         ingredients = {{"uranium-238", 10}},
         icon = "__PlutoniumEnergy__/graphics/icons/plutonium-238-nucleosynthesis.png",
-        icon_size = 32,
+        icon_size = 64,
+        icon_mipmaps = 4,
         subgroup = "raw-material",
         order = "l[plutonium-238-nuclesynthesis]",
         results = {
@@ -69,7 +71,8 @@ data:extend({
         category = "alpha-decay",
         ingredients = {{"PE-plutonium-239", 5}},
         icon = "__PlutoniumEnergy__/graphics/icons/plutonium-239-alpha-decay.png",
-        icon_size = 32,
+        icon_size = 64,
+        icon_mipmaps = 4,
         subgroup = "raw-material",
         order = "m[plutonium-239-decay]",
         results = {
@@ -87,7 +90,8 @@ data:extend({
         category = "excess-neutron-capture",
         ingredients = {{"uranium-238", 10}},
         icon = "__PlutoniumEnergy__/graphics/icons/uranium-238-excess-neutron-capture.png",
-        icon_size = 32,
+        icon_size = 64,
+        icon_mipmaps = 4,
         subgroup = "raw-material",
         order = "m[excess-neutron-capture]",
         results = {
@@ -116,7 +120,8 @@ data:extend({
         category = "centrifuging",
         ingredients = {{"used-up-MOX-fuel", 5}},
         icon = "__PlutoniumEnergy__/graphics/icons/MOX-fuel-reprocessing.png",
-        icon_size = 32,
+        icon_size = 64,
+        icon_mipmaps = 4,
         subgroup = "intermediate-product",
         order = "r[uranium-processing]-e[MOX-fuel-reprocessing]",
         main_product = "",