Skip to content

Commit

Permalink
Use ShinyAngelGFX images if it's installed.
Browse files Browse the repository at this point in the history
  • Loading branch information
Aragas committed Sep 7, 2019
1 parent 263c031 commit 64fefb1
Show file tree
Hide file tree
Showing 13 changed files with 5,629 additions and 5,495 deletions.
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 0.17.9
Date: 07.09.2019
Features:
- Added ShinyAngelGFX support.
---------------------------------------------------------------------------------------------------
Version: 0.17.8
Date: 07.09.2019
Bugfixes:
Expand Down
4 changes: 4 additions & 0 deletions data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,8 @@ if mods["Clowns-Processing"] then
require("prototypes.recipes.clowns.remelting-magnesium")

require("prototypes.remelting-override-clowns")
end

if mods["ShinyAngelGFX"] and iconset then -- Check if iconset exist as it could be edited in the future
require("prototypes.remelting-override-shinygfx")
end
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/icons/alloy-mixer-gfx-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/icons/alloy-mixer-gfx-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/icons/alloy-mixer-gfx-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/icons/alloy-mixer-gfx-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions info.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"name": "angelsextended-remelting",
"version": "0.17.8",
"version": "0.17.9",
"factorio_version": "0.17",
"title": "Angel's Extended - Remelting",
"author": "Aragas",
"contact": "[email protected]",
"homepage": "https://github.com/Aragas/angelsextended-remelting",
"description": "An extension to Angel's Smelting. Adds Alloy Mixer that is used to mix molten metals into alloys directly and adds the ability to remelt metal into molten liquids. Supports Bob's Mods and MadClown01's Processing.",
"description": "An extension to Angel's Smelting. Adds Alloy Mixer that is used to mix molten metals into alloys directly and adds the ability to remelt metal into molten liquids. Supports Bob's Mods, MadClown01's Processing and ShinyAngelGFX.",
"dependencies": [
"angelssmelting >= 0.4.0",
"? bobplates >= 0.15.0",
"? Clowns-Processing >= 1.3.2",
"? ShinyAngelGFX >= 0.15.10",
"! Better_Strand_Casting"]
}
10,863 changes: 5,370 additions & 5,493 deletions placeholders/alloy-mixer.pdn

Large diffs are not rendered by default.

247 changes: 247 additions & 0 deletions prototypes/remelting-override-shinygfx.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
local function iconset(name,suf,tier)
data.raw["item"][name..suf].icons = {
{
icon = "__angelsextended-remelting__/graphics/icons/"..name.."-gfx"..tier..".png",
},
{
icon = "__ShinyAngelGFX__/graphics/icons/num"..tier..".png",
}
}
data.raw["assembling-machine"][name..suf].icons = {
{
icon = "__angelsextended-remelting__/graphics/icons/"..name.."-gfx"..tier..".png",
},
{
icon = "__ShinyAngelGFX__/graphics/icons/num"..tier..".png",
}
}
end

if data.raw["assembling-machine"]["alloy-mixer"] then
if data.raw["assembling-machine"]["alloy-mixer"] then
iconset("alloy-mixer","","-1")
data.raw["assembling-machine"]["alloy-mixer"].animation = {
layers = {
{
filename = "__angelsextended-remelting__/graphics/entity/alloy-mixer/alloy-mixer.png",
width = 224,
height = 256,
line_length = 6,
frame_count = 36,
shift = {0, -0.5},
animation_speed = 0.5,
},
{
filename = "__angelsextended-remelting__/graphics/entity/alloy-mixer/alloy-mixer-gfx-1.png",
width = 224,
height = 256,
line_length = 6,
frame_count = 36,
shift = {0, -0.5},
animation_speed = 0.5,
}
}
}
data.raw["assembling-machine"]["alloy-mixer"].fluid_boxes = {
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {2, 3} }}
},
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {0, 3} }}
},
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {-2, 3} }}
},
{
production_type = "output",
pipe_covers = pipecoverspictures2(),
base_level = 1,
pipe_connections = {{ position = {0, -3} }}
},
}

end


if data.raw["assembling-machine"]["alloy-mixer-2"] then
iconset("alloy-mixer","-2","-2")
data.raw["assembling-machine"]["alloy-mixer-2"].animation = {
layers = {
{
filename = "__angelsextended-remelting__/graphics/entity/alloy-mixer/alloy-mixer.png",
width = 224,
height = 256,
line_length = 6,
frame_count = 36,
shift = {0, -0.5},
animation_speed = 0.5,
},
{
filename = "__angelsextended-remelting__/graphics/entity/alloy-mixer/alloy-mixer-gfx-2.png",
width = 224,
height = 256,
line_length = 6,
frame_count = 36,
shift = {0, -0.5},
animation_speed = 0.5,
}
}
}
data.raw["assembling-machine"]["alloy-mixer-2"].fluid_boxes = {
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {2, 3} }}
},
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {0, 3} }}
},
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {-2, 3} }}
},
{
production_type = "output",
pipe_covers = pipecoverspictures2(),
base_level = 1,
pipe_connections = {{ position = {0, -3} }}
},
}

end


if data.raw["assembling-machine"]["alloy-mixer-3"] then
iconset("alloy-mixer","-3","-3")
data.raw["assembling-machine"]["alloy-mixer-3"].animation = {
layers = {
{
filename = "__angelsextended-remelting__/graphics/entity/alloy-mixer/alloy-mixer.png",
width = 224,
height = 256,
line_length = 6,
frame_count = 36,
shift = {0, -0.5},
animation_speed = 0.5,
},
{
filename = "__angelsextended-remelting__/graphics/entity/alloy-mixer/alloy-mixer-gfx-3.png",
width = 224,
height = 256,
line_length = 6,
frame_count = 36,
shift = {0, -0.5},
animation_speed = 0.5,
}
}
}
data.raw["assembling-machine"]["alloy-mixer-3"].fluid_boxes = {
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {2, 3} }}
},
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {0, 3} }}
},
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {-2, 3} }}
},
{
production_type = "output",
pipe_covers = pipecoverspictures2(),
base_level = 1,
pipe_connections = {{ position = {0, -3} }}
},
}

end


if data.raw["assembling-machine"]["alloy-mixer-4"] then
iconset("alloy-mixer","-4","-4")
data.raw["assembling-machine"]["alloy-mixer-4"].animation = {
layers = {
{
filename = "__angelsextended-remelting__/graphics/entity/alloy-mixer/alloy-mixer.png",
width = 224,
height = 256,
line_length = 6,
frame_count = 36,
shift = {0, -0.5},
animation_speed = 0.5,
},
{
filename = "__angelsextended-remelting__/graphics/entity/alloy-mixer/alloy-mixer-gfx-4.png",
width = 224,
height = 256,
line_length = 6,
frame_count = 36,
shift = {0, -0.5},
animation_speed = 0.5,
}
}
}
data.raw["assembling-machine"]["alloy-mixer-4"].fluid_boxes = {
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {2, 3} }}
},
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {0, 3} }}
},
{
production_type = "input",
pipe_covers = pipecoverspictures2(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {-2, 3} }}
},
{
production_type = "output",
pipe_covers = pipecoverspictures2(),
base_level = 1,
pipe_connections = {{ position = {0, -3} }}
},
}

end
end

0 comments on commit 64fefb1

Please sign in to comment.