Merge pull request #29 from JohnTheCoolingFan/dev

1.2.6
JohnTheCoolingFan · Dec 29, 2020 · a115353 · a115353
2 parents f99e440 + 8179247
commit a115353
Show file tree

Hide file tree

Showing 100 changed files with 347 additions and 113 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.6
+Date: 29.12.2020
+  Graphics:
+    - Updated hardened electric mining drill and belt graphics.
+      I tried compressing them as much as I can using pngwolf, but still size is increased to 23MB
+      from 12MB previously
+    - Added remnants to belts and hardened electric mining drill.
+---------------------------------------------------------------------------------------------------
 Version: 1.2.5
 Date: 18.12.2020
   Locale:

diff --git a/data.lua b/data.lua
@@ -5,9 +5,7 @@ require("prototypes.item.item")
 require("prototypes.recipe.recipe")
 require("prototypes.technology.technology")
 
--- TODO: REMAKE ELECTRIC MINING DRILL'S GRAPHICS AGAIN
--- TODO: **URGENT** Fix #21 // Remake splitter and all other belt sprites
--- TODO: ~~god-module~~ Merged module that combines all 3 types of modules
+-- TODO: remnants for the rest of the entities
 -- TODO: modules and beacons starting from 0.18.32
 -- TODO: technology descriptions
 -- TODO: idea. Quantum tier (how original...)
diff --git a/graphics/entity/compressor/compressor-A-light.png b/graphics/entity/compressor/compressor-A-light.png
diff --git a/graphics/entity/compressor/compressor-B-light.png b/graphics/entity/compressor/compressor-B-light.png
diff --git a/graphics/entity/compressor/compressor-C-light.png b/graphics/entity/compressor/compressor-C-light.png
diff --git a/graphics/entity/compressor/hr-compressor-A-light.png b/graphics/entity/compressor/hr-compressor-A-light.png
diff --git a/graphics/entity/compressor/hr-compressor-B-light.png b/graphics/entity/compressor/hr-compressor-B-light.png
diff --git a/graphics/entity/compressor/hr-compressor-C-light.png b/graphics/entity/compressor/hr-compressor-C-light.png
diff --git a/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-E-front.png b/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-E-front.png
diff --git a/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-E-wet-front.png b/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-E-wet-front.png
diff --git a/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-E-wet.png b/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-E-wet.png
diff --git a/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-E.png b/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-E.png
diff --git a/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-N-wet-front.png b/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-N-wet-front.png
diff --git a/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-N-wet.png b/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-N-wet.png
diff --git a/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-N.png b/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-N.png
diff --git a/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-S-front.png b/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-S-front.png
diff --git a/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-S-wet-front.png b/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-S-wet-front.png
diff --git a/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-S-wet.png b/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-S-wet.png
diff --git a/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-S.png b/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-S.png
diff --git a/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-W-front.png b/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-W-front.png
diff --git a/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-W-wet-front.png b/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-W-wet-front.png
diff --git a/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-W-wet.png b/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-W-wet.png
diff --git a/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-W.png b/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-W.png
diff --git a/...dened-electric-mining-drill/hardened-electric-mining-drill-horizontal-front.png b/...dened-electric-mining-drill/hardened-electric-mining-drill-horizontal-front.png
diff --git a/...ty/hardened-electric-mining-drill/hardened-electric-mining-drill-horizontal.png b/...ty/hardened-electric-mining-drill/hardened-electric-mining-drill-horizontal.png
diff --git a/graphics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill.png b/graphics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill.png
diff --git a/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-front.png b/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-front.png
diff --git a/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-wet-front.png b/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-wet-front.png
diff --git a/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-wet.png b/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-wet.png
diff --git a/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E.png b/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E.png
diff --git a/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-N-wet-front.png b/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-N-wet-front.png
diff --git a/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-N-wet.png b/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-N-wet.png
diff --git a/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-N.png b/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-N.png
diff --git a/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-front.png b/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-front.png
diff --git a/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-wet-front.png b/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-wet-front.png
diff --git a/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-wet.png b/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-wet.png
diff --git a/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S.png b/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S.png
diff --git a/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-front.png b/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-front.png
diff --git a/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-wet-front.png b/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-wet-front.png
diff --git a/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-wet.png b/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-wet.png
diff --git a/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W.png b/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W.png
diff --git a/...ed-electric-mining-drill/hr-hardened-electric-mining-drill-horizontal-front.png b/...ed-electric-mining-drill/hr-hardened-electric-mining-drill-horizontal-front.png
diff --git a/...hardened-electric-mining-drill/hr-hardened-electric-mining-drill-horizontal.png b/...hardened-electric-mining-drill/hr-hardened-electric-mining-drill-horizontal.png
diff --git a/...ics/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill.png b/...ics/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill.png
diff --git a/...ened-electric-mining-drill/remnants/hardened-electric-mining-drill-remnants.png b/...ened-electric-mining-drill/remnants/hardened-electric-mining-drill-remnants.png
diff --git a/...d-electric-mining-drill/remnants/hr-hardened-electric-mining-drill-remnants.png b/...d-electric-mining-drill/remnants/hr-hardened-electric-mining-drill-remnants.png
diff --git a/graphics/entity/macerator/hr-macerator-A-light.png b/graphics/entity/macerator/hr-macerator-A-light.png
diff --git a/graphics/entity/macerator/hr-macerator-B-light.png b/graphics/entity/macerator/hr-macerator-B-light.png
diff --git a/graphics/entity/macerator/hr-macerator-C-light.png b/graphics/entity/macerator/hr-macerator-C-light.png
diff --git a/graphics/entity/macerator/macerator-A-light.png b/graphics/entity/macerator/macerator-A-light.png
diff --git a/graphics/entity/macerator/macerator-B-light.png b/graphics/entity/macerator/macerator-B-light.png
diff --git a/graphics/entity/macerator/macerator-C-light.png b/graphics/entity/macerator/macerator-C-light.png
diff --git a/graphics/entity/nuclear-splitter/hr-nuclear-splitter-east-top_patch.png b/graphics/entity/nuclear-splitter/hr-nuclear-splitter-east-top_patch.png
diff --git a/graphics/entity/nuclear-splitter/hr-nuclear-splitter-east.png b/graphics/entity/nuclear-splitter/hr-nuclear-splitter-east.png
diff --git a/graphics/entity/nuclear-splitter/hr-nuclear-splitter-north.png b/graphics/entity/nuclear-splitter/hr-nuclear-splitter-north.png
diff --git a/graphics/entity/nuclear-splitter/hr-nuclear-splitter-south.png b/graphics/entity/nuclear-splitter/hr-nuclear-splitter-south.png
diff --git a/graphics/entity/nuclear-splitter/hr-nuclear-splitter-west-top_patch.png b/graphics/entity/nuclear-splitter/hr-nuclear-splitter-west-top_patch.png
diff --git a/graphics/entity/nuclear-splitter/hr-nuclear-splitter-west.png b/graphics/entity/nuclear-splitter/hr-nuclear-splitter-west.png
diff --git a/graphics/entity/nuclear-splitter/nuclear-splitter-east-top_patch.png b/graphics/entity/nuclear-splitter/nuclear-splitter-east-top_patch.png
diff --git a/graphics/entity/nuclear-splitter/nuclear-splitter-east.png b/graphics/entity/nuclear-splitter/nuclear-splitter-east.png
diff --git a/graphics/entity/nuclear-splitter/nuclear-splitter-north.png b/graphics/entity/nuclear-splitter/nuclear-splitter-north.png
diff --git a/graphics/entity/nuclear-splitter/nuclear-splitter-south.png b/graphics/entity/nuclear-splitter/nuclear-splitter-south.png
diff --git a/graphics/entity/nuclear-splitter/nuclear-splitter-west-top_patch.png b/graphics/entity/nuclear-splitter/nuclear-splitter-west-top_patch.png
diff --git a/graphics/entity/nuclear-splitter/nuclear-splitter-west.png b/graphics/entity/nuclear-splitter/nuclear-splitter-west.png
diff --git a/graphics/entity/nuclear-splitter/remnants/hr-nuclear-splitter-remnants.png b/graphics/entity/nuclear-splitter/remnants/hr-nuclear-splitter-remnants.png
diff --git a/graphics/entity/nuclear-splitter/remnants/nuclear-splitter-remnants.png b/graphics/entity/nuclear-splitter/remnants/nuclear-splitter-remnants.png
diff --git a/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png b/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png
diff --git a/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png b/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png
diff --git a/...s/entity/nuclear-transport-belt/remnants/hr-nuclear-transport-belt-remnants.png b/...s/entity/nuclear-transport-belt/remnants/hr-nuclear-transport-belt-remnants.png
diff --git a/...hics/entity/nuclear-transport-belt/remnants/nuclear-transport-belt-remnants.png b/...hics/entity/nuclear-transport-belt/remnants/nuclear-transport-belt-remnants.png
diff --git a/graphics/entity/nuclear-underground-belt/hr-nuclear-underground-belt-structure.png b/graphics/entity/nuclear-underground-belt/hr-nuclear-underground-belt-structure.png
diff --git a/graphics/entity/nuclear-underground-belt/nuclear-underground-belt-structure.png b/graphics/entity/nuclear-underground-belt/nuclear-underground-belt-structure.png
diff --git a/...tity/nuclear-underground-belt/remnants/hr-nuclear-underground-belt-remnants.png b/...tity/nuclear-underground-belt/remnants/hr-nuclear-underground-belt-remnants.png
diff --git a/.../entity/nuclear-underground-belt/remnants/nuclear-underground-belt-remnants.png b/.../entity/nuclear-underground-belt/remnants/nuclear-underground-belt-remnants.png
diff --git a/graphics/entity/plutonium-splitter/hr-plutonium-splitter-east-top_patch.png b/graphics/entity/plutonium-splitter/hr-plutonium-splitter-east-top_patch.png
diff --git a/graphics/entity/plutonium-splitter/hr-plutonium-splitter-east.png b/graphics/entity/plutonium-splitter/hr-plutonium-splitter-east.png
diff --git a/graphics/entity/plutonium-splitter/hr-plutonium-splitter-north.png b/graphics/entity/plutonium-splitter/hr-plutonium-splitter-north.png
diff --git a/graphics/entity/plutonium-splitter/hr-plutonium-splitter-south.png b/graphics/entity/plutonium-splitter/hr-plutonium-splitter-south.png
diff --git a/graphics/entity/plutonium-splitter/hr-plutonium-splitter-west-top_patch.png b/graphics/entity/plutonium-splitter/hr-plutonium-splitter-west-top_patch.png
diff --git a/graphics/entity/plutonium-splitter/hr-plutonium-splitter-west.png b/graphics/entity/plutonium-splitter/hr-plutonium-splitter-west.png
diff --git a/graphics/entity/plutonium-splitter/plutonium-splitter-east-top_patch.png b/graphics/entity/plutonium-splitter/plutonium-splitter-east-top_patch.png
diff --git a/graphics/entity/plutonium-splitter/plutonium-splitter-east.png b/graphics/entity/plutonium-splitter/plutonium-splitter-east.png
diff --git a/graphics/entity/plutonium-splitter/plutonium-splitter-north.png b/graphics/entity/plutonium-splitter/plutonium-splitter-north.png
diff --git a/graphics/entity/plutonium-splitter/plutonium-splitter-south.png b/graphics/entity/plutonium-splitter/plutonium-splitter-south.png
diff --git a/graphics/entity/plutonium-splitter/plutonium-splitter-west-top_patch.png b/graphics/entity/plutonium-splitter/plutonium-splitter-west-top_patch.png
diff --git a/graphics/entity/plutonium-splitter/plutonium-splitter-west.png b/graphics/entity/plutonium-splitter/plutonium-splitter-west.png
diff --git a/graphics/entity/plutonium-splitter/remnants/hr-plutonium-splitter-remnants.png b/graphics/entity/plutonium-splitter/remnants/hr-plutonium-splitter-remnants.png
diff --git a/graphics/entity/plutonium-splitter/remnants/plutonium-splitter-remnants.png b/graphics/entity/plutonium-splitter/remnants/plutonium-splitter-remnants.png
diff --git a/graphics/entity/plutonium-transport-belt/hr-plutonium-transport-belt.png b/graphics/entity/plutonium-transport-belt/hr-plutonium-transport-belt.png
diff --git a/graphics/entity/plutonium-transport-belt/plutonium-transport-belt.png b/graphics/entity/plutonium-transport-belt/plutonium-transport-belt.png
diff --git a/...entity/plutonium-transport-belt/remnants/hr-express-transport-belt-remnants.png b/...entity/plutonium-transport-belt/remnants/hr-express-transport-belt-remnants.png
diff --git a/.../entity/plutonium-transport-belt/remnants/plutonium-transport-belt-remnants.png b/.../entity/plutonium-transport-belt/remnants/plutonium-transport-belt-remnants.png
diff --git a/...s/entity/plutonium-underground-belt/hr-plutonium-underground-belt-structure.png b/...s/entity/plutonium-underground-belt/hr-plutonium-underground-belt-structure.png
diff --git a/...hics/entity/plutonium-underground-belt/plutonium-underground-belt-structure.png b/...hics/entity/plutonium-underground-belt/plutonium-underground-belt-structure.png
diff --git a/.../plutonium-underground-belt/remnants/hr-plutonium-underground-belt-remnants.png b/.../plutonium-underground-belt/remnants/hr-plutonium-underground-belt-remnants.png
diff --git a/...ity/plutonium-underground-belt/remnants/plutonium-underground-belt-remnants.png b/...ity/plutonium-underground-belt/remnants/plutonium-underground-belt-remnants.png
diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "RandomFactorioThings",
-    "version": "1.2.5",
+    "version": "1.2.6",
     "title": "Random Factorio Things",
     "author": "JohnTheCoolingFan",
     "contact": "https://discord.gg/grHVhE2",

diff --git a/prototypes/entity/entities.lua b/prototypes/entity/entities.lua
@@ -1,6 +1,7 @@
 -- TODO: **URGENT** Fix #21
 --       Remake graphics again
 
+require('prototypes.entity.remnants')
 require("prototypes.entity.inserters")
 require("prototypes.entity.miners")
 require("prototypes.entity.assemblerpipes")
@@ -10,6 +11,7 @@ local entities = {}
 local nuclear_transport_belt = util.table.deepcopy(data.raw["transport-belt"]["express-transport-belt"])
 nuclear_transport_belt.name = "nuclear-transport-belt"
 nuclear_transport_belt.icon = "__RandomFactorioThings__/graphics/icons/nuclear-transport-belt.png"
+nuclear_transport_belt.corpse = 'nuclear-transport-belt-remnants'
 nuclear_transport_belt.minable.result = "nuclear-transport-belt"
 nuclear_transport_belt.speed = 0.125
 nuclear_transport_belt.next_upgrade = nil
@@ -20,6 +22,7 @@ table.insert(entities, nuclear_transport_belt)
 local nuclear_underground_belt = util.table.deepcopy(data.raw["underground-belt"]["express-underground-belt"])
 nuclear_underground_belt.name = "nuclear-underground-belt"
 nuclear_underground_belt.icon = "__RandomFactorioThings__/graphics/icons/nuclear-underground-belt.png"
+nuclear_underground_belt.corpse = 'nuclear-underground-belt-remnants'
 nuclear_underground_belt.minable.result = "nuclear-underground-belt"
 nuclear_underground_belt.max_distance = 11
 nuclear_underground_belt.speed = 0.125
@@ -38,6 +41,7 @@ table.insert(entities, nuclear_underground_belt)
 local nuclear_splitter = util.table.deepcopy(data.raw["splitter"]["express-splitter"])
 nuclear_splitter.name = "nuclear-splitter"
 nuclear_splitter.icon = "__RandomFactorioThings__/graphics/icons/nuclear-splitter.png"
+nuclear_splitter.corpse = 'nuclear-splitter-remnants'
 nuclear_splitter.minable.result = "nuclear-splitter"
 nuclear_splitter.speed = 0.125
 nuclear_splitter.next_upgrade = nil
@@ -190,6 +194,7 @@ if mods["PlutoniumEnergy"] then
     local plutonium_transport_belt = util.table.deepcopy(nuclear_transport_belt)
     plutonium_transport_belt.name = "plutonium-transport-belt"
     plutonium_transport_belt.icon = "__RandomFactorioThings__/graphics/icons/plutonium-transport-belt.png"
+    plutonium_transport_belt.corpse = 'plutonium-transport-belt-remnants'
     plutonium_transport_belt.minable.result = "plutonium-transport-belt"
     plutonium_transport_belt.speed = 0.15625
     plutonium_transport_belt.belt_animation_set.animation_set.filename = "__RandomFactorioThings__/graphics/entity/plutonium-transport-belt/plutonium-transport-belt.png"
@@ -199,6 +204,7 @@ if mods["PlutoniumEnergy"] then
     local plutonium_underground_belt = util.table.deepcopy(nuclear_underground_belt)
     plutonium_underground_belt.name = "plutonium-underground-belt"
     plutonium_underground_belt.icon = "__RandomFactorioThings__/graphics/icons/plutonium-underground-belt.png"
+    plutonium_underground_belt.corpse = 'plutonium-underground-belt-remnants'
     plutonium_underground_belt.minable.result = "plutonium-underground-belt"
     plutonium_underground_belt.speed = 0.15625
     plutonium_underground_belt.belt_animation_set = plutonium_transport_belt.belt_animation_set
@@ -215,6 +221,7 @@ if mods["PlutoniumEnergy"] then
     local plutonium_splitter = util.table.deepcopy(nuclear_splitter)
     plutonium_splitter.name = "plutonium-splitter"
     plutonium_splitter.icon = "__RandomFactorioThings__/graphics/icons/plutonium-splitter.png"
+    plutonium_splitter.corpse = 'plutonium-splitter-remnants'
     plutonium_splitter.minable.result = "plutonium-splitter"
     plutonium_splitter.speed = 0.15625
     plutonium_splitter.belt_animation_set = plutonium_transport_belt.belt_animation_set