Skip to content

Commit

Permalink
Merge branch 'master' into factorio-experimental
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrolGenhald committed Aug 29, 2016
2 parents 73bd75d + 50071ff commit 243c902
Show file tree
Hide file tree
Showing 292 changed files with 57 additions and 5 deletions.
17 changes: 14 additions & 3 deletions config.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
boxing = {};
boxing.subgroups = {

--subgroups to allow boxing for
boxing.itemSubgroups = {
["terrain"] = true,
["raw-resource"] = true,
["raw-material"] = true,
Expand Down Expand Up @@ -27,9 +29,18 @@ boxing.subgroups = {
["bob-robot-parts"] = true,
};

boxing.items = {
["rail-planner"] = true,
--specific items to allow boxing for
boxing.itemNames = {
["rail"] = true,
};

--boxing subgroups to create (for sorting items)
boxing.subgroups = {
["transport"] = true,
};
for subgroup, i in pairs(boxing.itemSubgroups) do
boxing.subgroups[subgroup] = true;
end

boxing.woodenUnlocks = {
{
Expand Down
8 changes: 7 additions & 1 deletion data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,16 @@ boxing.tungsten = data.raw.tool["science-pack-gold"]
;

for i,item in pairs(data.raw.item) do
if boxing.subgroups[item.subgroup] or boxing.items[item.name] then
if boxing.itemSubgroups[item.subgroup] or boxing.itemNames[item.name] then
table.insert(boxing.items, item);
end
end
for i,item in pairs(data.raw["rail-planner"]) do
if boxing.itemSubgroups[item.subgroup] or boxing.itemNames[item.name] then
table.insert(boxing.items, item);
end
end


if boxing.generateIconConfig then
data:extend({
Expand Down
Binary file added graphics/icons/box-of/steel/base/rail.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobelectronics/basic-circuit-board.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobelectronics/circuit-board.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobelectronics/cpu.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobelectronics/fibreglass-board.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobelectronics/phenolic-board.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobelectronics/resin.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobelectronics/rubber.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobelectronics/solder-plate.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobelectronics/solder.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobelectronics/wooden-board.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobplates/lithium-chloride.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobplates/lithium-cobalt-oxide.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobplates/lithium-ion-battery.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobplates/lithium-perchlorate.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobplates/lithium-plate.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/box-of/steel/bobplates/nitinol-bearing-ball.png
Binary file modified graphics/icons/box-of/steel/bobplates/salt.png
Binary file modified graphics/icons/box-of/steel/bobplates/silicon-wafer.png
Binary file modified graphics/icons/box-of/steel/bobplates/silver-zinc-battery.png
Binary file modified graphics/icons/box-of/steel/bobplates/steel-bearing-ball.png
Binary file modified graphics/icons/box-of/steel/bobplates/tin-plate.png
Binary file modified graphics/icons/box-of/steel/bobplates/titanium-bearing-ball.png
Binary file added graphics/icons/box-of/tungsten/base/rail.png
Binary file modified graphics/icons/box-of/tungsten/bobelectronics/circuit-board.png
Binary file modified graphics/icons/box-of/tungsten/bobelectronics/cpu.png
Binary file modified graphics/icons/box-of/tungsten/bobelectronics/fibreglass-board.png
Binary file modified graphics/icons/box-of/tungsten/bobelectronics/phenolic-board.png
Binary file modified graphics/icons/box-of/tungsten/bobelectronics/resin.png
Binary file modified graphics/icons/box-of/tungsten/bobelectronics/rubber.png
Binary file modified graphics/icons/box-of/tungsten/bobelectronics/solder-plate.png
Binary file modified graphics/icons/box-of/tungsten/bobelectronics/solder.png
Binary file modified graphics/icons/box-of/tungsten/bobelectronics/wooden-board.png
Binary file modified graphics/icons/box-of/tungsten/bobplates/lithium-chloride.png
Binary file modified graphics/icons/box-of/tungsten/bobplates/lithium-cobalt-oxide.png
Binary file modified graphics/icons/box-of/tungsten/bobplates/lithium-ion-battery.png
Binary file modified graphics/icons/box-of/tungsten/bobplates/lithium-perchlorate.png
Binary file modified graphics/icons/box-of/tungsten/bobplates/lithium-plate.png
Binary file modified graphics/icons/box-of/tungsten/bobplates/salt.png
Binary file modified graphics/icons/box-of/tungsten/bobplates/silicon-wafer.png
Binary file modified graphics/icons/box-of/tungsten/bobplates/silver-zinc-battery.png
Binary file modified graphics/icons/box-of/tungsten/bobplates/steel-bearing-ball.png
Binary file modified graphics/icons/box-of/tungsten/bobplates/tin-plate.png
Binary file added graphics/icons/box-of/wooden/base/rail.png
Binary file modified graphics/icons/box-of/wooden/bobelectronics/basic-circuit-board.png
Binary file modified graphics/icons/box-of/wooden/bobelectronics/circuit-board.png
Binary file modified graphics/icons/box-of/wooden/bobelectronics/cpu.png
Binary file modified graphics/icons/box-of/wooden/bobelectronics/fibreglass-board.png
Binary file modified graphics/icons/box-of/wooden/bobelectronics/phenolic-board.png
Binary file modified graphics/icons/box-of/wooden/bobelectronics/resin.png
Binary file modified graphics/icons/box-of/wooden/bobelectronics/rubber.png
Binary file modified graphics/icons/box-of/wooden/bobelectronics/solder-plate.png
Binary file modified graphics/icons/box-of/wooden/bobelectronics/solder.png
Binary file modified graphics/icons/box-of/wooden/bobelectronics/wooden-board.png
Binary file modified graphics/icons/box-of/wooden/bobplates/lithium-chloride.png
Binary file modified graphics/icons/box-of/wooden/bobplates/lithium-cobalt-oxide.png
Binary file modified graphics/icons/box-of/wooden/bobplates/lithium-ion-battery.png
Binary file modified graphics/icons/box-of/wooden/bobplates/lithium-perchlorate.png
Binary file modified graphics/icons/box-of/wooden/bobplates/lithium-plate.png
Binary file modified graphics/icons/box-of/wooden/bobplates/nitinol-bearing-ball.png
Binary file modified graphics/icons/box-of/wooden/bobplates/salt.png
Binary file modified graphics/icons/box-of/wooden/bobplates/silicon-wafer.png
Binary file modified graphics/icons/box-of/wooden/bobplates/silver-zinc-battery.png
Binary file modified graphics/icons/box-of/wooden/bobplates/steel-bearing-ball.png
Binary file modified graphics/icons/box-of/wooden/bobplates/tin-plate.png
Binary file modified graphics/icons/box-of/wooden/bobplates/titanium-bearing-ball.png
Binary file added graphics/icons/box/steel/base/rail.png
Binary file modified graphics/icons/box/steel/bobelectronics/basic-circuit-board.png
Binary file modified graphics/icons/box/steel/bobelectronics/circuit-board.png
Binary file modified graphics/icons/box/steel/bobelectronics/cpu.png
Binary file modified graphics/icons/box/steel/bobelectronics/electronic-components.png
Binary file modified graphics/icons/box/steel/bobelectronics/electronic-logic-board.png
Binary file modified graphics/icons/box/steel/bobelectronics/fibreglass-board.png
Binary file modified graphics/icons/box/steel/bobelectronics/integrated-electronics.png
Binary file modified graphics/icons/box/steel/bobelectronics/phenolic-board.png
Binary file modified graphics/icons/box/steel/bobelectronics/resin.png
Binary file modified graphics/icons/box/steel/bobelectronics/rubber.png
Binary file modified graphics/icons/box/steel/bobelectronics/solder-plate.png
Binary file modified graphics/icons/box/steel/bobelectronics/solder.png
Binary file modified graphics/icons/box/steel/bobelectronics/wooden-board.png
Binary file modified graphics/icons/box/steel/bobplates/lithium-chloride.png
Binary file modified graphics/icons/box/steel/bobplates/lithium-cobalt-oxide.png
Binary file modified graphics/icons/box/steel/bobplates/lithium-ion-battery.png
Binary file modified graphics/icons/box/steel/bobplates/lithium-perchlorate.png
Binary file modified graphics/icons/box/steel/bobplates/lithium-plate.png
Binary file modified graphics/icons/box/steel/bobplates/nitinol-bearing-ball.png
Binary file modified graphics/icons/box/steel/bobplates/salt.png
Binary file modified graphics/icons/box/steel/bobplates/silicon-wafer.png
Binary file modified graphics/icons/box/steel/bobplates/silver-zinc-battery.png
Binary file modified graphics/icons/box/steel/bobplates/steel-bearing-ball.png
Binary file modified graphics/icons/box/steel/bobplates/tin-plate.png
Binary file modified graphics/icons/box/steel/bobplates/titanium-bearing-ball.png
Binary file added graphics/icons/box/tungsten/base/rail.png
Binary file modified graphics/icons/box/tungsten/bobelectronics/basic-circuit-board.png
Binary file modified graphics/icons/box/tungsten/bobelectronics/circuit-board.png
Binary file modified graphics/icons/box/tungsten/bobelectronics/cpu.png
Binary file modified graphics/icons/box/tungsten/bobelectronics/fibreglass-board.png
Binary file modified graphics/icons/box/tungsten/bobelectronics/phenolic-board.png
Binary file modified graphics/icons/box/tungsten/bobelectronics/resin.png
Binary file modified graphics/icons/box/tungsten/bobelectronics/rubber.png
Binary file modified graphics/icons/box/tungsten/bobelectronics/solder-plate.png
Binary file modified graphics/icons/box/tungsten/bobelectronics/solder.png
Binary file modified graphics/icons/box/tungsten/bobelectronics/wooden-board.png
Binary file modified graphics/icons/box/tungsten/bobplates/lithium-chloride.png
Binary file modified graphics/icons/box/tungsten/bobplates/lithium-cobalt-oxide.png
Binary file modified graphics/icons/box/tungsten/bobplates/lithium-ion-battery.png
Binary file modified graphics/icons/box/tungsten/bobplates/lithium-perchlorate.png
Binary file modified graphics/icons/box/tungsten/bobplates/lithium-plate.png
Binary file modified graphics/icons/box/tungsten/bobplates/nitinol-bearing-ball.png
Binary file modified graphics/icons/box/tungsten/bobplates/salt.png
Binary file modified graphics/icons/box/tungsten/bobplates/silicon-wafer.png
Binary file modified graphics/icons/box/tungsten/bobplates/silver-zinc-battery.png
Binary file modified graphics/icons/box/tungsten/bobplates/steel-bearing-ball.png
Binary file modified graphics/icons/box/tungsten/bobplates/tin-plate.png
Binary file modified graphics/icons/box/tungsten/bobplates/titanium-bearing-ball.png
Binary file added graphics/icons/box/wooden/base/rail.png
Binary file modified graphics/icons/box/wooden/bobelectronics/basic-circuit-board.png
Binary file modified graphics/icons/box/wooden/bobelectronics/circuit-board.png
Binary file modified graphics/icons/box/wooden/bobelectronics/cpu.png
Binary file modified graphics/icons/box/wooden/bobelectronics/electronic-components.png
Binary file modified graphics/icons/box/wooden/bobelectronics/electronic-logic-board.png
Binary file modified graphics/icons/box/wooden/bobelectronics/fibreglass-board.png
Binary file modified graphics/icons/box/wooden/bobelectronics/phenolic-board.png
Binary file modified graphics/icons/box/wooden/bobelectronics/resin.png
Binary file modified graphics/icons/box/wooden/bobelectronics/rubber.png
Binary file modified graphics/icons/box/wooden/bobelectronics/solder-plate.png
Binary file modified graphics/icons/box/wooden/bobelectronics/solder.png
Binary file modified graphics/icons/box/wooden/bobelectronics/wooden-board.png
Binary file modified graphics/icons/box/wooden/bobplates/lithium-chloride.png
Binary file modified graphics/icons/box/wooden/bobplates/lithium-cobalt-oxide.png
Binary file modified graphics/icons/box/wooden/bobplates/lithium-ion-battery.png
Binary file modified graphics/icons/box/wooden/bobplates/lithium-perchlorate.png
Binary file modified graphics/icons/box/wooden/bobplates/lithium-plate.png
Binary file modified graphics/icons/box/wooden/bobplates/nitinol-bearing-ball.png
Binary file modified graphics/icons/box/wooden/bobplates/salt.png
Binary file modified graphics/icons/box/wooden/bobplates/silicon-wafer.png
Binary file modified graphics/icons/box/wooden/bobplates/silver-zinc-battery.png
Binary file modified graphics/icons/box/wooden/bobplates/steel-bearing-ball.png
Binary file modified graphics/icons/box/wooden/bobplates/tin-plate.png
Binary file modified graphics/icons/box/wooden/bobplates/titanium-bearing-ball.png
Binary file added graphics/icons/unbox/steel/base/rail.png
Binary file modified graphics/icons/unbox/steel/bobelectronics/basic-circuit-board.png
Binary file modified graphics/icons/unbox/steel/bobelectronics/circuit-board.png
Binary file modified graphics/icons/unbox/steel/bobelectronics/cpu.png
Binary file modified graphics/icons/unbox/steel/bobelectronics/fibreglass-board.png
Binary file modified graphics/icons/unbox/steel/bobelectronics/phenolic-board.png
Binary file modified graphics/icons/unbox/steel/bobelectronics/resin.png
Binary file modified graphics/icons/unbox/steel/bobelectronics/rubber.png
Binary file modified graphics/icons/unbox/steel/bobelectronics/solder-plate.png
Binary file modified graphics/icons/unbox/steel/bobelectronics/solder.png
Binary file modified graphics/icons/unbox/steel/bobelectronics/wooden-board.png
Binary file modified graphics/icons/unbox/steel/bobplates/lithium-chloride.png
Binary file modified graphics/icons/unbox/steel/bobplates/lithium-cobalt-oxide.png
Binary file modified graphics/icons/unbox/steel/bobplates/lithium-ion-battery.png
Binary file modified graphics/icons/unbox/steel/bobplates/lithium-perchlorate.png
Binary file modified graphics/icons/unbox/steel/bobplates/lithium-plate.png
Binary file modified graphics/icons/unbox/steel/bobplates/nitinol-bearing-ball.png
Binary file modified graphics/icons/unbox/steel/bobplates/salt.png
Binary file modified graphics/icons/unbox/steel/bobplates/silicon-wafer.png
Binary file modified graphics/icons/unbox/steel/bobplates/silver-zinc-battery.png
Binary file modified graphics/icons/unbox/steel/bobplates/steel-bearing-ball.png
Binary file modified graphics/icons/unbox/steel/bobplates/tin-plate.png
Binary file modified graphics/icons/unbox/steel/bobplates/titanium-bearing-ball.png
Binary file added graphics/icons/unbox/tungsten/base/rail.png
Binary file modified graphics/icons/unbox/tungsten/bobelectronics/circuit-board.png
Binary file modified graphics/icons/unbox/tungsten/bobelectronics/cpu.png
Binary file modified graphics/icons/unbox/tungsten/bobelectronics/fibreglass-board.png
Binary file modified graphics/icons/unbox/tungsten/bobelectronics/phenolic-board.png
Binary file modified graphics/icons/unbox/tungsten/bobelectronics/resin.png
Binary file modified graphics/icons/unbox/tungsten/bobelectronics/rubber.png
Binary file modified graphics/icons/unbox/tungsten/bobelectronics/solder-plate.png
Binary file modified graphics/icons/unbox/tungsten/bobelectronics/solder.png
Binary file modified graphics/icons/unbox/tungsten/bobelectronics/wooden-board.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/lithium-chloride.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/lithium-cobalt-oxide.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/lithium-ion-battery.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/lithium-perchlorate.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/lithium-plate.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/nitinol-bearing-ball.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/salt.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/silicon-wafer.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/silver-zinc-battery.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/steel-bearing-ball.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/tin-plate.png
Binary file modified graphics/icons/unbox/tungsten/bobplates/titanium-bearing-ball.png
Binary file added graphics/icons/unbox/wooden/base/rail.png
Binary file modified graphics/icons/unbox/wooden/bobelectronics/basic-circuit-board.png
Binary file modified graphics/icons/unbox/wooden/bobelectronics/circuit-board.png
Binary file modified graphics/icons/unbox/wooden/bobelectronics/cpu.png
Binary file modified graphics/icons/unbox/wooden/bobelectronics/fibreglass-board.png
Binary file modified graphics/icons/unbox/wooden/bobelectronics/phenolic-board.png
Binary file modified graphics/icons/unbox/wooden/bobelectronics/resin.png
Binary file modified graphics/icons/unbox/wooden/bobelectronics/rubber.png
Binary file modified graphics/icons/unbox/wooden/bobelectronics/solder-plate.png
Binary file modified graphics/icons/unbox/wooden/bobelectronics/solder.png
Binary file modified graphics/icons/unbox/wooden/bobelectronics/wooden-board.png
Binary file modified graphics/icons/unbox/wooden/bobplates/lithium-chloride.png
Binary file modified graphics/icons/unbox/wooden/bobplates/lithium-cobalt-oxide.png
Binary file modified graphics/icons/unbox/wooden/bobplates/lithium-ion-battery.png
Binary file modified graphics/icons/unbox/wooden/bobplates/lithium-perchlorate.png
Binary file modified graphics/icons/unbox/wooden/bobplates/lithium-plate.png
Binary file modified graphics/icons/unbox/wooden/bobplates/nitinol-bearing-ball.png
Binary file modified graphics/icons/unbox/wooden/bobplates/salt.png
Binary file modified graphics/icons/unbox/wooden/bobplates/silicon-wafer.png
Binary file modified graphics/icons/unbox/wooden/bobplates/silver-zinc-battery.png
Binary file modified graphics/icons/unbox/wooden/bobplates/steel-bearing-ball.png
Binary file modified graphics/icons/unbox/wooden/bobplates/tin-plate.png
Binary file modified graphics/icons/unbox/wooden/bobplates/titanium-bearing-ball.png
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "boxing-2",
"version": "2.0.2",
"version": "2.0.3",
"title": "Boxing 2",
"author": "AndrolGenhald",
"description": "Pack items into boxes to store more of them.",
Expand Down
35 changes: 35 additions & 0 deletions migrations/boxing-2_2.0.3.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
for i, force in pairs(game.forces) do
if force.technologies["wooden-boxing"].researched then
force.recipes["wooden-box-rail"].enabled = true;
force.recipes["wooden-unbox-rail"].enabled = true;
for j, recipe in pairs(force.recipes) do
if recipe.subgroup.name == "boxing-wooden-terrain"
or recipe.subgroup.name == "unboxing-wooden-terrain"
then
recipe.enabled = true;
end
end
end
if force.technologies["steel-boxing"].researched then
force.recipes["steel-box-rail"].enabled = true;
force.recipes["steel-unbox-rail"].enabled = true;
for j, recipe in pairs(force.recipes) do
if recipe.subgroup.name == "boxing-steel-terrain"
or recipe.subgroup.name == "unboxing-steel-terrain"
then
recipe.enabled = true;
end
end
end
if force.technologies["tungsten-boxing"].researched then
force.recipes["tungsten-box-rail"].enabled = true;
force.recipes["tungsten-unbox-rail"].enabled = true;
for j, recipe in pairs(force.recipes) do
if recipe.subgroup.name == "boxing-tungsten-terrain"
or recipe.subgroup.name == "unboxing-tungsten-terrain"
then
recipe.enabled = true;
end
end
end
end

0 comments on commit 243c902

Please sign in to comment.