Skip to content

Instantly share code, notes, and snippets.

@rededog

rededog/angelscomponents_0.2.0-fixes-for-0.16.x.patch

Created January 19, 2018 06:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rededog/a7edbf0995051fcdf4c1900ffde123c6 to your computer and use it in GitHub Desktop.
Save rededog/a7edbf0995051fcdf4c1900ffde123c6 to your computer and use it in GitHub Desktop.
Download ZIP
angelslogistics & angelscomponents 0.16.x PATCH
Raw
angelscomponents_0.2.0-fixes-for-0.16.x.patch
From f0ed09373a639ab0de9fb548cef595e30b9b2853 Mon Sep 17 00:00:00 2001
From: Joel Koglin <JoelKoglin@gmail.com>
Date: Thu, 18 Jan 2018 22:26:04 -0800
Subject: [PATCH] fixes for 0.16.x
---
info.json | 2 +-
prototypes/entities/equipment.lua | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/info.json b/info.json
index cb65028..8f38d69 100644
--- a/info.json
+++ b/info.json
@@ -1,7 +1,7 @@
{
"name": "angelscomponents",
"version": "0.2.0",
- "factorio_version": "0.15",
+ "factorio_version": "0.16",
"title": "Angel's Components and Tech [BETA]",
"author": "Arch666Angel",
"contact": "",
diff --git a/prototypes/entities/equipment.lua b/prototypes/entities/equipment.lua
index 8037b1b..901314a 100644
--- a/prototypes/entities/equipment.lua
+++ b/prototypes/entities/equipment.lua
@@ -5,6 +5,7 @@ data:extend(
type = "item",
name = "angels-burner-generator-vequip",
icon = "__angelscomponents__/graphics/icons/burner-generator-ico.png",
+ icon_size = 32,
placed_as_equipment_result = "angels-burner-generator-vequip",
flags = {"goes-to-main-inventory"},
subgroup = "angels-equipment-energy",
@@ -47,6 +48,7 @@ data:extend(
type = "item",
name = "angels-fusion-reactor-vequip",
icon = "__base__/graphics/icons/fusion-reactor-equipment.png",
+ icon_size = 32,
placed_as_equipment_result = "angels-fusion-reactor-vequip",
flags = {"goes-to-main-inventory"},
subgroup = "angels-equipment-energy",
@@ -84,6 +86,7 @@ data:extend(
type = "item",
name = "angels-repair-roboport-vequip",
icon = "__base__/graphics/icons/rocket-part.png",
+ icon_size = 32,
placed_as_equipment_result = "angels-repair-roboport-vequip",
flags = {"goes-to-main-inventory"},
subgroup = "angels-equipment-robo",
@@ -144,6 +147,7 @@ data:extend(
type = "item",
name = "angels-construction-roboport-vequip",
icon = "__angelscomponents__/graphics/icons/construction-roboport-ico.png",
+ icon_size = 32,
placed_as_equipment_result = "angels-construction-roboport-vequip",
flags = {"goes-to-main-inventory"},
subgroup = "angels-equipment-robo",
@@ -206,6 +210,7 @@ data:extend(
type = "item",
name = "angels-heavy-energy-shield-vequip",
icon = "__base__/graphics/icons/energy-shield-equipment.png",
+ icon_size = 32,
placed_as_equipment_result = "angels-heavy-energy-shield-vequip",
flags = {"goes-to-main-inventory"},
subgroup = "angels-equipment-hdef",
@@ -245,6 +250,7 @@ data:extend(
type = "item",
name = "angels-rocket-defense-equipment-vequip",
icon = "__angelscomponents__/graphics/icons/heavy-tank-rocket-launcher-icon.png",
+ icon_size = 32,
placed_as_equipment_result = "angels-rocket-defense-equipment-vequip",
flags = {"goes-to-main-inventory"},
subgroup = "angels-equipment-hat",
--
2.14.3 (Apple Git-98)
Raw
angelslogistics_0.2.1-0001-fixes-for-0.16.x.patch
From 078b5b53d39261e9d496793c6cc32956920b187c Mon Sep 17 00:00:00 2001
From: Joel Koglin <JoelKoglin@gmail.com>
Date: Thu, 18 Jan 2018 22:40:44 -0800
Subject: [PATCH] fixes for 0.16.x
---
info.json | 2 +-
prototypes/buildings/cargo-roboport.lua | 12 +++++++-
prototypes/buildings/cargo-robot.lua | 4 +++
prototypes/buildings/chests.lua | 29 +++++++++++++++----
prototypes/buildings/construction-roboport.lua | 12 +++++++-
prototypes/buildings/construction-robot.lua | 2 ++
prototypes/buildings/inserter.lua | 6 ++++
prototypes/buildings/loader.lua | 10 +++++--
prototypes/buildings/relay-station.lua | 24 ++++++++++++++--
prototypes/buildings/zone-expander.lua | 24 ++++++++++++++--
prototypes/entities/crawler-train.lua | 40 +++++++++++++++-----------
prototypes/entities/crawler.lua | 2 ++
prototypes/logistics-category.lua | 2 +-
prototypes/technology/logistics-technology.lua | 18 ++++++------
14 files changed, 147 insertions(+), 40 deletions(-)
diff --git a/info.json b/info.json
index 3a2389c..4a7c99f 100755
--- a/info.json
+++ b/info.json
@@ -1,7 +1,7 @@
{
"name": "angelslogistics",
"version": "0.2.1",
- "factorio_version": "0.15",
+ "factorio_version": "0.16",
"title": "Angel's Logistics [BETA]",
"author": "Arch666Angel",
"contact": "",
diff --git a/prototypes/buildings/cargo-roboport.lua b/prototypes/buildings/cargo-roboport.lua
index 8ec7ecd..5f347ed 100755
--- a/prototypes/buildings/cargo-roboport.lua
+++ b/prototypes/buildings/cargo-roboport.lua
@@ -1,9 +1,18 @@
+circuit_connector_definitions["cargo-roboport"] = circuit_connector_definitions.create
+(
+ universal_connector_template,
+ {
+ { variation = 18, main_offset = {0.59375, 1.3125}, shadow_offset = nil, show_shadow = false },
+ }
+)
+
data:extend(
{
{
type = "item",
name = "cargo-roboport",
icon = "__angelslogistics__/graphics/icons/cargo-roboport.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "a[cargo-roboport]",
@@ -14,6 +23,7 @@
type = "roboport",
name = "cargo-roboport",
icon = "__angelslogistics__/graphics/icons/cargo-roboport.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "cargo-roboport"},
max_health = 1000,
@@ -135,7 +145,7 @@
green = {0.78125, 1.53125}
}
},
- circuit_connector_sprites = get_circuit_connector_sprites({0.59375, 1.3125}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["cargo-roboport"].sprites,
circuit_wire_max_distance = 10,
default_available_logistic_output_signal = {type = "virtual", name = "signal-X"},
default_total_logistic_output_signal = {type = "virtual", name = "signal-Y"},
diff --git a/prototypes/buildings/cargo-robot.lua b/prototypes/buildings/cargo-robot.lua
index bc12333..eca2966 100755
--- a/prototypes/buildings/cargo-robot.lua
+++ b/prototypes/buildings/cargo-robot.lua
@@ -4,6 +4,7 @@
type = "item",
name = "cargo-robot",
icon = "__angelslogistics__/graphics/icons/cargo-robot.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "c[angels-logistics]-c[cargo-robot]",
@@ -14,6 +15,7 @@
type = "logistic-robot",
name = "cargo-robot",
icon = "__angelslogistics__/graphics/icons/cargo-robot.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"},
minable = {hardness = 0.1, mining_time = 0.1, result = "cargo-robot"},
max_health = 100,
@@ -133,6 +135,7 @@
type = "item",
name = "cargo-robot-2",
icon = "__angelslogistics__/graphics/icons/cargo-robot.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "c[angels-logistics]-c[cargo-robot]",
@@ -143,6 +146,7 @@
type = "logistic-robot",
name = "cargo-robot-2",
icon = "__angelslogistics__/graphics/icons/cargo-robot.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"},
minable = {hardness = 0.1, mining_time = 0.1, result = "cargo-robot-2"},
max_health = 100,
diff --git a/prototypes/buildings/chests.lua b/prototypes/buildings/chests.lua
index f321f3b..5a536ca 100755
--- a/prototypes/buildings/chests.lua
+++ b/prototypes/buildings/chests.lua
@@ -1,9 +1,18 @@
+circuit_connector_definitions["angels-chests"] = circuit_connector_definitions.create
+(
+ universal_connector_template,
+ {
+ { variation = 18, main_offset = {0.59375, 1.3125}, shadow_offset = nil, show_shadow = false },
+ }
+)
+
data:extend(
{
{
type = "item",
name = "angels-big-chest",
icon = "__angelslogistics__/graphics/icons/chest-big-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "a",
@@ -14,6 +23,7 @@
type = "container",
name = "angels-big-chest",
icon = "__angelslogistics__/graphics/icons/chest-big-ico.png",
+ icon_size = 32,
flags = {"placeable-neutral", "player-creation"},
minable = {mining_time = 1, result = "angels-big-chest"},
max_health = 100,
@@ -53,13 +63,14 @@
green = {0.40625, 0.375},
}
},
- circuit_connector_sprites = get_circuit_connector_sprites({0.1875, 0.15625}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["angels-chests"].sprites,
circuit_wire_max_distance = 7.5
},
{
type = "item",
name = "angels-logistic-chest-requester",
icon = "__angelslogistics__/graphics/icons/chest-big-requester-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "a[angels-logistic-chest-requester]",
@@ -70,6 +81,7 @@
type = "logistic-container",
name = "angels-logistic-chest-requester",
icon = "__angelslogistics__/graphics/icons/chest-big-requester-ico.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-logistic-chest-requester"},
max_health = 150,
@@ -78,6 +90,7 @@
selection_box = {{-1, -1}, {1, 1}},
fast_replaceable_group = "container",
inventory_size = 60,
+ logistic_slots_count = 60,
logistic_mode = "requester",
open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 },
close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 },
@@ -104,12 +117,13 @@
}
},
circuit_wire_max_distance = 7.5,
- circuit_connector_sprites = get_circuit_connector_sprites({0.1875, 0.15625}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["angels-chests"].sprites,
},
{
type = "item",
name = "angels-logistic-chest-passive-provider",
icon = "__angelslogistics__/graphics/icons/chest-big-passive-provider-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "b[angels-logistic-chest-passive-provider]",
@@ -120,6 +134,7 @@
type = "logistic-container",
name = "angels-logistic-chest-passive-provider",
icon = "__angelslogistics__/graphics/icons/chest-big-passive-provider-ico.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-logistic-chest-passive-provider"},
max_health = 150,
@@ -154,12 +169,13 @@
}
},
circuit_wire_max_distance = 7.5,
- circuit_connector_sprites = get_circuit_connector_sprites({0.1875, 0.15625}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["angels-chests"].sprites,
},
{
type = "item",
name = "angels-logistic-chest-active-provider",
icon = "__angelslogistics__/graphics/icons/chest-big-active-provider-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "b",
@@ -170,6 +186,7 @@
type = "logistic-container",
name = "angels-logistic-chest-active-provider",
icon = "__base__/graphics/icons/logistic-chest-active-provider.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-logistic-chest-active-provider"},
max_health = 150,
@@ -204,12 +221,13 @@
}
},
circuit_wire_max_distance = 7.5,
- circuit_connector_sprites = get_circuit_connector_sprites({0.1875, 0.15625}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["angels-chests"].sprites,
},
{
type = "item",
name = "angels-logistic-chest-storage",
icon = "__angelslogistics__/graphics/icons/chest-big-storage-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "b",
@@ -220,6 +238,7 @@
type = "logistic-container",
name = "angels-logistic-chest-storage",
icon = "__base__/graphics/icons/logistic-chest-storage.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-logistic-chest-storage"},
max_health = 150,
@@ -254,7 +273,7 @@
}
},
circuit_wire_max_distance = 7.5,
- circuit_connector_sprites = get_circuit_connector_sprites({0.1875, 0.15625}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["angels-chests"].sprites,
},
}
)
\ No newline at end of file
diff --git a/prototypes/buildings/construction-roboport.lua b/prototypes/buildings/construction-roboport.lua
index 77bf550..d6bf407 100755
--- a/prototypes/buildings/construction-roboport.lua
+++ b/prototypes/buildings/construction-roboport.lua
@@ -1,9 +1,18 @@
+circuit_connector_definitions["construction-roboport"] = circuit_connector_definitions.create
+(
+ universal_connector_template,
+ {
+ { variation = 18, main_offset = {0.59375, 1.3125}, shadow_offset = nil, show_shadow = false },
+ }
+)
+
data:extend(
{
{
type = "item",
name = "construction-roboport",
icon = "__angelslogistics__/graphics/icons/construction-roboport-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "a[construction-roboport]",
@@ -14,6 +23,7 @@
type = "roboport",
name = "construction-roboport",
icon = "__angelslogistics__/graphics/icons/construction-roboport-ico.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "construction-roboport"},
max_health = 800,
@@ -135,7 +145,7 @@
green = {0.78125, 1.53125}
}
},
- circuit_connector_sprites = get_circuit_connector_sprites({0.59375, 1.3125}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["construction-roboport"].sprites,
circuit_wire_max_distance = 10,
default_available_logistic_output_signal = {type = "virtual", name = "signal-X"},
default_total_logistic_output_signal = {type = "virtual", name = "signal-Y"},
diff --git a/prototypes/buildings/construction-robot.lua b/prototypes/buildings/construction-robot.lua
index 3e52933..45c2599 100755
--- a/prototypes/buildings/construction-robot.lua
+++ b/prototypes/buildings/construction-robot.lua
@@ -4,6 +4,7 @@
type = "item",
name = "angels-construction-robot",
icon = "__angelslogistics__/graphics/icons/construction-robot-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "c[angels-construction-robot]",
@@ -14,6 +15,7 @@
type = "construction-robot",
name = "angels-construction-robot",
icon = "__angelslogistics__/graphics/icons/construction-robot-ico.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"},
minable = {hardness = 0.1, mining_time = 0.1, result = "angels-construction-robot"},
resistances = { { type = "fire", percent = 85 } },
diff --git a/prototypes/buildings/inserter.lua b/prototypes/buildings/inserter.lua
index abc94b9..ccb464d 100755
--- a/prototypes/buildings/inserter.lua
+++ b/prototypes/buildings/inserter.lua
@@ -4,6 +4,7 @@ data:extend(
type = "item",
name = "angels-inserter",
icon = "__base__/graphics/icons/inserter.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
place_result = "angels-inserter",
stack_size = 50,
@@ -12,6 +13,7 @@ data:extend(
type = "inserter",
name = "angels-inserter",
icon = "__base__/graphics/icons/inserter.png",
+ icon_size = 32,
flags = {"placeable-neutral", "placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-inserter"},
max_health = 40,
@@ -127,6 +129,7 @@ data:extend(
type = "item",
name = "angels-long-inserter",
icon = "__base__/graphics/icons/inserter.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
place_result = "angels-long-inserter",
stack_size = 10,
@@ -135,6 +138,7 @@ data:extend(
type = "inserter",
name = "angels-long-inserter",
icon = "__base__/graphics/icons/inserter.png",
+ icon_size = 32,
flags = {"placeable-neutral", "placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-long-inserter"},
max_health = 40,
@@ -253,6 +257,7 @@ data:extend(
type = "item",
name = "angels-filter-inserter",
icon = "__base__/graphics/icons/inserter.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
place_result = "angels-filter-inserter",
stack_size = 10,
@@ -261,6 +266,7 @@ data:extend(
type = "inserter",
name = "angels-filter-inserter",
icon = "__base__/graphics/icons/inserter.png",
+ icon_size = 32,
flags = {"placeable-neutral", "placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-filter-inserter"},
max_health = 40,
diff --git a/prototypes/buildings/loader.lua b/prototypes/buildings/loader.lua
index 8a9e161..c44d0a6 100755
--- a/prototypes/buildings/loader.lua
+++ b/prototypes/buildings/loader.lua
@@ -4,6 +4,7 @@ data:extend(
type = "item",
name = "angels-yellow-loader",
icon = "__angelslogistics__/graphics/icons/loader-yellow-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-loader",
order = "a[angels-yellow-loader]",
@@ -14,6 +15,7 @@ data:extend(
type = "loader",
name = "angels-yellow-loader",
icon = "__angelslogistics__/graphics/icons/loader-yellow-ico.png",
+ icon_size = 32,
flags = {"placeable-neutral", "player-creation", "fast-replaceable-no-build-while-moving"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-yellow-loader"},
max_health = 70,
@@ -69,7 +71,8 @@ data:extend(
type = "item",
name = "angels-red-loader",
icon = "__angelslogistics__/graphics/icons/loader-red-ico.png",
- flags = {"goes-to-quickbar"},
+ icon_size = 32,
+ flags = {"goes-to-quickbar"},
subgroup = "angels-loader",
order = "b[angels-red-loader]",
place_result = "angels-red-loader",
@@ -79,6 +82,7 @@ data:extend(
type = "loader",
name = "angels-red-loader",
icon = "__angelslogistics__/graphics/icons/loader-red-ico.png",
+ icon_size = 32,
flags = {"placeable-neutral", "player-creation", "fast-replaceable-no-build-while-moving"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-red-loader"},
max_health = 70,
@@ -134,7 +138,8 @@ data:extend(
type = "item",
name = "angels-blue-loader",
icon = "__angelslogistics__/graphics/icons/loader-blue-ico.png",
- flags = {"goes-to-quickbar"},
+ icon_size = 32,
+ flags = {"goes-to-quickbar"},
subgroup = "angels-loader",
order = "c[angels-blue-loader]",
place_result = "angels-blue-loader",
@@ -144,6 +149,7 @@ data:extend(
type = "loader",
name = "angels-blue-loader",
icon = "__angelslogistics__/graphics/icons/loader-blue-ico.png",
+ icon_size = 32,
flags = {"placeable-neutral", "player-creation", "fast-replaceable-no-build-while-moving"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-blue-loader"},
max_health = 70,
diff --git a/prototypes/buildings/relay-station.lua b/prototypes/buildings/relay-station.lua
index 97da1d1..8d7c8eb 100755
--- a/prototypes/buildings/relay-station.lua
+++ b/prototypes/buildings/relay-station.lua
@@ -1,9 +1,26 @@
+circuit_connector_definitions["angels-relay-station"] = circuit_connector_definitions.create
+(
+ universal_connector_template,
+ {
+ { variation = 18, main_offset = {0.59375, 1.3125}, shadow_offset = nil, show_shadow = false },
+ }
+)
+
+circuit_connector_definitions["angels-relay-station-2"] = circuit_connector_definitions.create
+(
+ universal_connector_template,
+ {
+ { variation = 18, main_offset = {0.59375, 1.3125}, shadow_offset = nil, show_shadow = false },
+ }
+)
+
data:extend(
{
{
type = "item",
name = "angels-relay-station",
icon = "__angelslogistics__/graphics/icons/relay-station-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "b[angels-relay-station]",
@@ -14,6 +31,7 @@
type = "roboport",
name = "angels-relay-station",
icon = "__angelslogistics__/graphics/icons/relay-station-ico.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-relay-station"},
fast_replaceable_group = "roboport",
@@ -113,7 +131,7 @@
green = {0.78125, 1.53125}
}
},
- circuit_connector_sprites = get_circuit_connector_sprites({0.59375, 1.3125}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["angels-relay-station"].sprites,
circuit_wire_max_distance = 10,
default_available_logistic_output_signal = {type = "virtual", name = "signal-X"},
default_total_logistic_output_signal = {type = "virtual", name = "signal-Y"},
@@ -124,6 +142,7 @@
type = "item",
name = "angels-relay-station-2",
icon = "__angelslogistics__/graphics/icons/relay-station-2-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "b[angels-relay-station-2]",
@@ -134,6 +153,7 @@
type = "roboport",
name = "angels-relay-station-2",
icon = "__angelslogistics__/graphics/icons/relay-station-2-ico.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-relay-station-2"},
fast_replaceable_group = "roboport",
@@ -231,7 +251,7 @@
green = {0.78125, 1.53125}
}
},
- circuit_connector_sprites = get_circuit_connector_sprites({0.59375, 1.3125}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["angels-relay-station-2"].sprites,
circuit_wire_max_distance = 10,
default_available_logistic_output_signal = {type = "virtual", name = "signal-X"},
default_total_logistic_output_signal = {type = "virtual", name = "signal-Y"},
diff --git a/prototypes/buildings/zone-expander.lua b/prototypes/buildings/zone-expander.lua
index ff9abf7..7523034 100755
--- a/prototypes/buildings/zone-expander.lua
+++ b/prototypes/buildings/zone-expander.lua
@@ -1,9 +1,26 @@
+circuit_connector_definitions["angels-zone-expander"] = circuit_connector_definitions.create
+(
+ universal_connector_template,
+ {
+ { variation = 18, main_offset = {0.59375, 1.3125}, shadow_offset = nil, show_shadow = false },
+ }
+)
+
+circuit_connector_definitions["angels-zone-expander-2"] = circuit_connector_definitions.create
+(
+ universal_connector_template,
+ {
+ { variation = 18, main_offset = {0.59375, 1.3125}, shadow_offset = nil, show_shadow = false },
+ }
+)
+
data:extend(
{
{
type = "item",
name = "angels-zone-expander",
icon = "__angelslogistics__/graphics/icons/angels-zone-expander.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "b[angels-zone-expander]",
@@ -14,6 +31,7 @@
type = "roboport",
name = "angels-zone-expander",
icon = "__angelslogistics__/graphics/icons/angels-zone-expander.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-zone-expander"},
fast_replaceable_group = "roboport",
@@ -113,7 +131,7 @@
green = {0.78125, 1.53125}
}
},
- circuit_connector_sprites = get_circuit_connector_sprites({0.59375, 1.3125}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["angels-zone-expander"].sprites,
circuit_wire_max_distance = 10,
default_available_logistic_output_signal = {type = "virtual", name = "signal-X"},
default_total_logistic_output_signal = {type = "virtual", name = "signal-Y"},
@@ -124,6 +142,7 @@
type = "item",
name = "angels-zone-expander-2",
icon = "__angelslogistics__/graphics/icons/angels-zone-expander-2.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-cargo-bots",
order = "b[angels-zone-expander-2]",
@@ -134,6 +153,7 @@
type = "roboport",
name = "angels-zone-expander-2",
icon = "__angelslogistics__/graphics/icons/angels-zone-expander-2.png",
+ icon_size = 32,
flags = {"placeable-player", "player-creation"},
minable = {hardness = 0.2, mining_time = 0.5, result = "angels-zone-expander-2"},
fast_replaceable_group = "roboport",
@@ -231,7 +251,7 @@
green = {0.78125, 1.53125}
}
},
- circuit_connector_sprites = get_circuit_connector_sprites({0.59375, 1.3125}, nil, 18),
+ circuit_connector_sprites = circuit_connector_definitions["angels-zone-expander-2"].sprites,
circuit_wire_max_distance = 10,
default_available_logistic_output_signal = {type = "virtual", name = "signal-X"},
default_total_logistic_output_signal = {type = "virtual", name = "signal-Y"},
diff --git a/prototypes/entities/crawler-train.lua b/prototypes/entities/crawler-train.lua
index 0c141c4..dc7c070 100755
--- a/prototypes/entities/crawler-train.lua
+++ b/prototypes/entities/crawler-train.lua
@@ -32,6 +32,7 @@ data:extend(
type = "item-with-entity-data",
name = "crawler-locomotive",
icon = "__angelslogistics__/graphics/icons/crawler-loco-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-crawler-train",
order = "a[crawler-locomotive]",
@@ -42,6 +43,7 @@ data:extend(
type = "locomotive",
name = "crawler-locomotive",
icon = "__angelslogistics__/graphics/icons/crawler-loco-ico.png",
+ icon_size = 32,
flags = {"placeable-neutral", "player-creation", "placeable-off-grid", "not-on-map"},
minable = {mining_time = 1, result = "crawler-locomotive"},
mined_sound = {filename = "__core__/sound/deconstruct-medium.ogg"},
@@ -169,9 +171,9 @@ data:extend(
{
-- left side
{
- type = "create-smoke",
+ type = "create-trivial-smoke",
repeat_count = 50, --125
- entity_name = "smoke-train-stop",
+ smoke_name = "smoke-train-stop",
initial_height = 0,
-- smoke goes to the left
speed = {-0.03, 0},
@@ -181,9 +183,9 @@ data:extend(
},
-- right side
{
- type = "create-smoke",
+ type = "create-trivial-smoke",
repeat_count = 50, --125
- entity_name = "smoke-train-stop",
+ smoke_name = "smoke-train-stop",
initial_height = 0,
-- smoke goes to the right
speed = {0.03, 0},
@@ -222,6 +224,7 @@ data:extend(
type = "item-with-entity-data",
name = "crawler-locomotive-wagon",
icon = "__angelslogistics__/graphics/icons/crawler-loco-wagon-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-crawler-train",
order = "b[crawler-locomotive-wagon]",
@@ -232,6 +235,7 @@ data:extend(
type = "locomotive",
name = "crawler-locomotive-wagon",
icon = "__angelslogistics__/graphics/icons/crawler-loco-wagon-ico.png",
+ icon_size = 32,
flags = {"placeable-neutral", "player-creation", "placeable-off-grid", "not-on-map"},
minable = {mining_time = 1, result = "crawler-locomotive-wagon"},
mined_sound = {filename = "__core__/sound/deconstruct-medium.ogg"},
@@ -371,9 +375,9 @@ data:extend(
{
-- front left side
{
- type = "create-smoke",
+ type = "create-trivial-smoke",
repeat_count = 50, --125
- entity_name = "smoke-train-stop",
+ smoke_name = "smoke-train-stop",
initial_height = 0,
-- smoke goes to the left
speed = {-0.03, 0},
@@ -383,9 +387,9 @@ data:extend(
},
-- front right side
{
- type = "create-smoke",
+ type = "create-trivial-smoke",
repeat_count = 50, --125
- entity_name = "smoke-train-stop",
+ smoke_name = "smoke-train-stop",
initial_height = 0,
-- smoke goes to the right
speed = {0.03, 0},
@@ -395,9 +399,9 @@ data:extend(
},
-- rear left side
{
- type = "create-smoke",
+ type = "create-trivial-smoke",
repeat_count = 50, --125
- entity_name = "smoke-train-stop",
+ smoke_name = "smoke-train-stop",
initial_height = 0,
-- smoke goes to the left
speed = {-0.03, 0},
@@ -407,9 +411,9 @@ data:extend(
},
-- rear right side
{
- type = "create-smoke",
+ type = "create-trivial-smoke",
repeat_count = 50, --125
- entity_name = "smoke-train-stop",
+ smoke_name = "smoke-train-stop",
initial_height = 0,
-- smoke goes to the right
speed = {0.03, 0},
@@ -447,7 +451,8 @@ data:extend(
{
type = "item-with-entity-data",
name = "crawler-wagon",
- icon = "__angelslogistics__/graphics/icons/crawler-wagon-ico.png",
+ icon = "__angelslogistics__/graphics/icons/crawler-wagon-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-crawler-train",
order = "c[crawler-wagon]",
@@ -457,7 +462,8 @@ data:extend(
{
type = "cargo-wagon",
name = "crawler-wagon",
- icon = "__angelslogistics__/graphics/icons/crawler-wagon-ico.png",
+ icon = "__angelslogistics__/graphics/icons/crawler-wagon-ico.png",
+ icon_size = 32,
flags = {"placeable-neutral", "player-creation", "placeable-off-grid", "not-on-map"},
inventory_size = 64,
minable = {mining_time = 1, result = "crawler-wagon"},
@@ -641,7 +647,8 @@ data:extend(
{
type = "item-with-entity-data",
name = "crawler-bot-wagon",
- icon = "__angelslogistics__/graphics/icons/crawler-bot-wagon-ico.png",
+ icon = "__angelslogistics__/graphics/icons/crawler-bot-wagon-ico.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-crawler-train",
order = "d[crawler-bot-wagon]",
@@ -651,7 +658,8 @@ data:extend(
{
type = "cargo-wagon",
name = "crawler-bot-wagon",
- icon = "__angelslogistics__/graphics/icons/crawler-bot-wagon-ico.png",
+ icon = "__angelslogistics__/graphics/icons/crawler-bot-wagon-ico.png",
+ icon_size = 32,
flags = {"placeable-neutral", "player-creation", "placeable-off-grid", "not-on-map"},
inventory_size = 128,
minable = {mining_time = 1, result = "crawler-bot-wagon"},
diff --git a/prototypes/entities/crawler.lua b/prototypes/entities/crawler.lua
index 4486c66..4465b78 100755
--- a/prototypes/entities/crawler.lua
+++ b/prototypes/entities/crawler.lua
@@ -14,6 +14,7 @@ data:extend(
type = "item-with-entity-data",
name = "angels-crawler",
icon = "__angelslogistics__/graphics/icons/crawler-icon.png",
+ icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "angels-vehicles",
order = "b[angels-crawler]",
@@ -24,6 +25,7 @@ data:extend(
type = "car",
name = "angels-crawler",
icon = "__angelslogistics__/graphics/icons/crawler-icon.png",
+ icon_size = 32,
flags = {"pushable", "placeable-neutral", "player-creation", "placeable-off-grid"},
minable = {mining_time = 1, result = "angels-crawler"},
max_health = 3500,
diff --git a/prototypes/logistics-category.lua b/prototypes/logistics-category.lua
index 65778af..5dbf22e 100755
--- a/prototypes/logistics-category.lua
+++ b/prototypes/logistics-category.lua
@@ -10,7 +10,7 @@ data:extend(
order = "q",
inventory_order = "q",
icon = "__angelslogistics__/graphics/item-group/cargo-roboport-group.png",
- icon_size = 64,
+ icon_size = 64,
},
{
type = "item-subgroup",
diff --git a/prototypes/technology/logistics-technology.lua b/prototypes/technology/logistics-technology.lua
index 07559aa..ee14399 100755
--- a/prototypes/technology/logistics-technology.lua
+++ b/prototypes/technology/logistics-technology.lua
@@ -4,7 +4,7 @@ data:extend(
type = "technology",
name = "angels-construction-robots",
icon = "__angelslogistics__/graphics/technology/construction-roboport-tech.png",
- icon_size = 128,
+ icon_size = 128,
prerequisites =
{
"engine",
@@ -35,7 +35,7 @@ data:extend(
type = "technology",
name = "cargo-robots",
icon = "__angelslogistics__/graphics/technology/robot-tech.png",
- icon_size = 128,
+ icon_size = 128,
prerequisites =
{
"engine",
@@ -86,7 +86,7 @@ data:extend(
type = "technology",
name = "cargo-robots-2",
icon = "__angelslogistics__/graphics/technology/robot-tech.png",
- icon_size = 128,
+ icon_size = 128,
prerequisites =
{
"cargo-robots",
@@ -125,7 +125,7 @@ data:extend(
type = "technology",
name = "cargo-robots-3",
icon = "__angelslogistics__/graphics/technology/robot-tech.png",
- icon_size = 128,
+ icon_size = 128,
prerequisites =
{
"cargo-robots-2",
@@ -154,7 +154,7 @@ data:extend(
type = "technology",
name = "angels-crawler",
icon = "__angelslogistics__/graphics/technology/crawler-tech.png",
- icon_size = 128,
+ icon_size = 128,
prerequisites =
{
"angels-vequipment-1",
@@ -185,7 +185,7 @@ data:extend(
type = "technology",
name = "angels-crawler-train",
icon = "__angelslogistics__/graphics/technology/crawler-loco-tech.png",
- icon_size = 128,
+ icon_size = 128,
prerequisites =
{
"angels-crawler",
@@ -226,7 +226,7 @@ data:extend(
type = "technology",
name = "angels-yellow-loader",
icon = "__angelslogistics__/graphics/technology/yellow-loader-tech.png",
- icon_size = 128,
+ icon_size = 128,
prerequisites =
{
},
@@ -251,7 +251,7 @@ data:extend(
type = "technology",
name = "angels-red-loader",
icon = "__angelslogistics__/graphics/technology/red-loader-tech.png",
- icon_size = 128,
+ icon_size = 128,
prerequisites =
{
},
@@ -277,7 +277,7 @@ data:extend(
type = "technology",
name = "angels-blue-loader",
icon = "__angelslogistics__/graphics/technology/blue-loader-tech.png",
- icon_size = 128,
+ icon_size = 128,
prerequisites =
{
},
--
2.14.3 (Apple Git-98)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment