Skip to content

Commit

Permalink
Initial release.
Browse files Browse the repository at this point in the history
Metal plates remelting added.
Added support for Bob's Mods
  • Loading branch information
Aragas committed Sep 6, 2019
0 parents commit d944894
Show file tree
Hide file tree
Showing 39 changed files with 1,285 additions and 0 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 Vitaly Mikhailov

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# AngelsExtendedRemelting
An extension to Angel's Smelting that adds the ability to remelt metal into molten liquids.
6 changes: 6 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---------------------------------------------------------------------------------------------------
Version: 0.17.0
Features:
- Initial release.
- Metal plates remelting added.
- Added support for Bob's Mods
Empty file added data-final-fixes.lua
Empty file.
34 changes: 34 additions & 0 deletions data-updates.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
if angelsmods and angelsmods.smelting then
require("prototypes.recipes.angelssmelting.remelting-aluminium")
require("prototypes.recipes.angelssmelting.remelting-chrome")
require("prototypes.recipes.angelssmelting.remelting-cobalt")
require("prototypes.recipes.angelssmelting.remelting-copper")
require("prototypes.recipes.angelssmelting.remelting-glass")
require("prototypes.recipes.angelssmelting.remelting-gold")
require("prototypes.recipes.angelssmelting.remelting-iron")
require("prototypes.recipes.angelssmelting.remelting-lead")
require("prototypes.recipes.angelssmelting.remelting-manganese")
require("prototypes.recipes.angelssmelting.remelting-nickel")
require("prototypes.recipes.angelssmelting.remelting-platinum")
require("prototypes.recipes.angelssmelting.remelting-silicon")
require("prototypes.recipes.angelssmelting.remelting-silver")
require("prototypes.recipes.angelssmelting.remelting-solder")
require("prototypes.recipes.angelssmelting.remelting-steel")
require("prototypes.recipes.angelssmelting.remelting-tin")
require("prototypes.recipes.angelssmelting.remelting-titanium")
require("prototypes.recipes.angelssmelting.remelting-tungsten")
require("prototypes.recipes.angelssmelting.remelting-zinc")

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

if bobmods and bobmods.plates then
require("prototypes.recipes.bobplates.remelting-brass")
require("prototypes.recipes.bobplates.remelting-bronze")
require("prototypes.recipes.bobplates.remelting-cobalt-steel")
require("prototypes.recipes.bobplates.remelting-gunmetal")
require("prototypes.recipes.bobplates.remelting-invar")
require("prototypes.recipes.bobplates.remelting-nitinol")

require("prototypes.remelting-override-bob")
end
7 changes: 7 additions & 0 deletions data.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
if not aragas then aragas = {} end

if not aragas.functions then aragas.functions = {} end

if aragas.functions then
aragas.functions.OV = require("prototypes.override-functions")
end
Binary file added graphics/icons/remelting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "angelsextended-remelting",
"version": "0.17.0",
"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 that adds the ability to remelt metal into molten liquids. Supports Bob's Mods.",
"dependencies": [
"angelssmelting >= 0.4.0",
"? bobplates >= 0.15.0" ]
}
8 changes: 8 additions & 0 deletions locale/en/remelting.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[technology-name]
remelting-tier=Advanced Metal Remelting

[mod-setting-name]
remelting-smooth-integration=Smooth Angel's Smelting Integration
[mod-setting-description]
remelting-smooth-integration=Use Angel's Smelting technologies for remelting discovery instead of using external technologies based on Metallurgy.
23 changes: 23 additions & 0 deletions prototypes/override-functions.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
local ov_functions = {}

ov_functions.disable_technology = function (technology) -- disable technology (may be a table containing a list of technologies)
if type(technology) == "table" then
for tk, tech in pairs(technology) do
data.raw["technology"][tech].enabled = false
end
else
data.raw["technology"][technology].enabled = false
end
end

ov_functions.enable_technology = function (technology) -- enable technology (may be a table containing a list of technologies)
if type(technology) == "table" then
for tk, tech in pairs(technology) do
data.raw["technology"][tech].enabled = true
end
else
data.raw["technology"][technology].enabled = true
end
end

return ov_functions
33 changes: 33 additions & 0 deletions prototypes/recipes/angelssmelting/remelting-aluminium.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
data:extend(
{
-- Aluminium Plate
{
type = "recipe",
name = "molten-aluminium-remelting",
category = "induction-smelting",
subgroup = "angels-aluminium-casting",
energy_required = 6,
enabled = "false",
ingredients ={
{type="item", name="angels-plate-aluminium", amount=4},
},
results=
{
{type="fluid", name="liquid-molten-aluminium", amount=40},
},
icons = {
{
icon = "__angelssmelting__/graphics/icons/molten-aluminium.png",
},
{
icon = "__angelsextended-remelting__/graphics/icons/remelting.png",
tint = {r = 0.8, g = 0.8, b = 0.8, a = 0.5},
scale = 0.32,
shift = {-12, -12},
}
},
icon_size = 32,
order = "a]",
},
}
)
33 changes: 33 additions & 0 deletions prototypes/recipes/angelssmelting/remelting-chrome.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
data:extend(
{
-- Chrome Plate
{
type = "recipe",
name = "molten-chrome-remelting",
category = "induction-smelting",
subgroup = "angels-chrome-casting",
energy_required = 6,
enabled = "false",
ingredients ={
{type="item", name="angels-plate-chrome", amount=4},
},
results=
{
{type="fluid", name="liquid-molten-chrome", amount=40},
},
icons = {
{
icon = "__angelssmelting__/graphics/icons/molten-chrome.png",
},
{
icon = "__angelsextended-remelting__/graphics/icons/remelting.png",
tint = {r = 0.8, g = 0.8, b = 0.8, a = 0.5},
scale = 0.32,
shift = {-12, -12},
}
},
icon_size = 32,
order = "a]",
},
}
)
33 changes: 33 additions & 0 deletions prototypes/recipes/angelssmelting/remelting-cobalt.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
data:extend(
{
-- Cobalt Plate
{
type = "recipe",
name = "molten-cobalt-remelting",
category = "induction-smelting",
subgroup = "angels-cobalt-casting",
energy_required = 6,
enabled = "false",
ingredients ={
{type="item", name="angels-plate-cobalt", amount=4},
},
results=
{
{type="fluid", name="liquid-molten-cobalt", amount=40},
},
icons = {
{
icon = "__angelssmelting__/graphics/icons/molten-cobalt.png",
},
{
icon = "__angelsextended-remelting__/graphics/icons/remelting.png",
tint = {r = 0.8, g = 0.8, b = 0.8, a = 0.5},
scale = 0.32,
shift = {-12, -12},
}
},
icon_size = 32,
order = "a]",
},
}
)
33 changes: 33 additions & 0 deletions prototypes/recipes/angelssmelting/remelting-copper.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
data:extend(
{
-- Copper Plate
{
type = "recipe",
name = "molten-copper-remelting",
category = "induction-smelting",
subgroup = "angels-copper-casting",
energy_required = 6,
enabled = "false",
ingredients ={
{type="item", name="angels-plate-copper", amount=4},
},
results=
{
{type="fluid", name="liquid-molten-copper", amount=40},
},
icons = {
{
icon = "__angelssmelting__/graphics/icons/molten-copper.png",
},
{
icon = "__angelsextended-remelting__/graphics/icons/remelting.png",
tint = {r = 0.8, g = 0.8, b = 0.8, a = 0.5},
scale = 0.32,
shift = {-12, -12},
}
},
icon_size = 32,
order = "a]",
},
}
)
33 changes: 33 additions & 0 deletions prototypes/recipes/angelssmelting/remelting-glass.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
data:extend(
{
-- Glass Plate
{
type = "recipe",
name = "molten-glass-remelting",
category = "induction-smelting",
subgroup = "angels-glass-casting",
energy_required = 6,
enabled = "false",
ingredients ={
{type="item", name="angels-plate-glass", amount=4},
},
results=
{
{type="fluid", name="liquid-molten-glass", amount=40},
},
icons = {
{
icon = "__angelssmelting__/graphics/icons/molten-glass.png",
},
{
icon = "__angelsextended-remelting__/graphics/icons/remelting.png",
tint = {r = 0.8, g = 0.8, b = 0.8, a = 0.5},
scale = 0.32,
shift = {-12, -12},
}
},
icon_size = 32,
order = "a]",
},
}
)
33 changes: 33 additions & 0 deletions prototypes/recipes/angelssmelting/remelting-gold.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
data:extend(
{
-- Gold Plate
{
type = "recipe",
name = "molten-gold-remelting",
category = "induction-smelting",
subgroup = "angels-gold-casting",
energy_required = 6,
enabled = "false",
ingredients ={
{type="item", name="angels-plate-gold", amount=4},
},
results=
{
{type="fluid", name="liquid-molten-gold", amount=40},
},
icons = {
{
icon = "__angelssmelting__/graphics/icons/molten-gold.png",
},
{
icon = "__angelsextended-remelting__/graphics/icons/remelting.png",
tint = {r = 0.8, g = 0.8, b = 0.8, a = 0.5},
scale = 0.32,
shift = {-12, -12},
}
},
icon_size = 32,
order = "a]",
},
}
)
33 changes: 33 additions & 0 deletions prototypes/recipes/angelssmelting/remelting-iron.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
data:extend(
{
-- Iron Plate
{
type = "recipe",
name = "molten-iron-remelting",
category = "induction-smelting",
subgroup = "angels-iron-casting",
energy_required = 6,
enabled = "false",
ingredients ={
{type="item", name="angels-plate-iron", amount=4},
},
results=
{
{type="fluid", name="liquid-molten-iron", amount=40},
},
icons = {
{
icon = "__angelssmelting__/graphics/icons/molten-iron.png",
},
{
icon = "__angelsextended-remelting__/graphics/icons/remelting.png",
tint = {r = 0.8, g = 0.8, b = 0.8, a = 0.5},
scale = 0.32,
shift = {-12, -12},
}
},
icon_size = 32,
order = "a]",
},
}
)
Loading

0 comments on commit d944894

Please sign in to comment.