From 23339a0fcaeaf09d511c37a89a1134ff8f1de4f7 Mon Sep 17 00:00:00 2001 From: jakimfett Date: Tue, 28 Jun 2016 21:24:17 -0700 Subject: [PATCH] Remove 'smart' versions of warehouses --- prototypes/entity.lua | 108 +++++++++++--------------------------- prototypes/item.lua | 20 ------- prototypes/recipe.lua | 26 --------- prototypes/technology.lua | 28 ---------- 4 files changed, 30 insertions(+), 152 deletions(-) diff --git a/prototypes/entity.lua b/prototypes/entity.lua index e7af115d..348a2b98 100644 --- a/prototypes/entity.lua +++ b/prototypes/entity.lua @@ -36,6 +36,21 @@ data:extend( height = 240, shift = {1.0, -0.3}, }, + circuit_wire_max_distance = 7.5, + circuit_wire_connection_point = + { + shadow = + { + red = {2.01, 0.6}, + green = {2.52, 0.6} + -- green = {4.5, 2.6} + }, + wire = + { + red = {1.71, 0.3}, + green = {2.22, 0.3} + } + }, }, { -- Passive Provider Warehouse - 800 slots type = "logistic-container", @@ -197,45 +212,6 @@ data:extend( } }, }, - { -- Smart Warehouse - 800 slots - type = "smart-container", - name = "warehouse-smart", - icon = "__Warehousing__/graphics/icons/warehouse-smart.png", - flags = {"placeable-player", "player-creation"}, - minable = {hardness = 0.2, mining_time = 0.5, result = "warehouse-smart"}, - max_health = 450, - corpse = "big-remnants", - collision_box = {{-2.7, -2.7}, {2.7, 2.7}}, -- {{-2.2, -2.2}, {2.2, 2.2}}, - selection_box = {{-3.0, -3.0}, {3.0, 3.0}}, -- {{-2.5, -2.5}, {2.5, 2.5}}, - fast_replaceable_group = "container", - inventory_size = 800, - open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 }, - close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - picture = - { - filename = "__Warehousing__/graphics/entity/warehouse-smart-shadow.png", - priority = "high", - width = 260, - height = 240, - shift = {1.0, -0.3}, - }, - circuit_wire_max_distance = 7.5, - circuit_wire_connection_point = - { - shadow = - { - red = {2.01, 0.6}, - green = {2.52, 0.6} - -- green = {4.5, 2.6} - }, - wire = - { - red = {1.71, 0.3}, - green = {2.22, 0.3} - } - }, - }, { -- Basic Storehouse - 150 slots type = "container", name = "storehouse-basic", @@ -266,6 +242,21 @@ data:extend( width = 129, height = 100, shift = {0.421875, 0}, + },, + circuit_wire_max_distance = 7.5, + circuit_wire_connection_point = + { + shadow = + { + red = {2.01, 0.6}, + green = {2.52, 0.6} + -- green = {4.5, 2.6} + }, + wire = + { + red = {1.71, 0.3}, + green = {2.22, 0.3} + } }, }, { -- Provider Storehouse - 150 slots @@ -428,44 +419,5 @@ data:extend( } }, }, - { -- Smart Storehouse - 150 slots - type = "smart-container", - name = "storehouse-smart", - icon = "__Warehousing__/graphics/icons/storehouse-smart.png", - flags = {"placeable-player", "player-creation"}, - minable = {hardness = 0.2, mining_time = 0.5, result = "storehouse-smart"}, - max_health = 250, - corpse = "big-remnants", - collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, - selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, - fast_replaceable_group = "container", - inventory_size = 150, - open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 }, - close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, - picture = - { - filename = "__Warehousing__/graphics/entity/storehouse-smart.png", - priority = "high", - width = 129, - height = 100, - shift = {0.421875, 0}, - }, - circuit_wire_max_distance = 7.5, - circuit_wire_connection_point = - { - shadow = - { - red = {.26, -0.6}, - green = {.36, -0.6} - -- green = {2.36, 1.3} - }, - wire = - { - red = {-0.16, -0.9}, - green = {0.16, -0.9} - } - }, - }, }) diff --git a/prototypes/item.lua b/prototypes/item.lua index 08bac405..c692505f 100644 --- a/prototypes/item.lua +++ b/prototypes/item.lua @@ -54,16 +54,6 @@ data:extend({ place_result = "warehouse-requester", stack_size = 15 }, - { - type = "item", - name = "warehouse-smart", - icon = "__Warehousing__/graphics/icons/warehouse-smart.png", - flags = {"goes-to-quickbar"}, - subgroup = "storage", - order = "a[items]-d[smart-chest]", - place_result = "warehouse-smart", - stack_size = 15 - }, { type = "item", name = "storehouse-basic", @@ -114,14 +104,4 @@ data:extend({ place_result = "storehouse-requester", stack_size = 15 }, - { - type = "item", - name = "storehouse-smart", - icon = "__Warehousing__/graphics/icons/storehouse-smart.png", - flags = {"goes-to-quickbar"}, - subgroup = "storage", - order = "a[items]-d[smart-chest]", - place_result = "storehouse-smart", - stack_size = 15 - }, }) diff --git a/prototypes/recipe.lua b/prototypes/recipe.lua index 5970e8c2..932acdda 100644 --- a/prototypes/recipe.lua +++ b/prototypes/recipe.lua @@ -70,19 +70,6 @@ data:extend({ }, result = "warehouse-requester" }, - { -- Smart Warehouse - type = "recipe", - name = "warehouse-smart", - enabled = "false", - ingredients = - { - {"warehouse-basic",1}, - {"smart-chest",1}, - {"iron-plate",20}, - {"electronic-circuit", 5}, - }, - result = "warehouse-smart" - }, { -- Basic Storehouse type = "recipe", name = "storehouse-basic", @@ -149,17 +136,4 @@ data:extend({ }, result = "storehouse-requester" }, - { -- Smart Storehouse - type = "recipe", - name = "storehouse-smart", - enabled = "false", - ingredients = - { - {"storehouse-basic",1}, - {"smart-chest",1}, - {"iron-plate",5}, - {"electronic-circuit", 2}, - }, - result = "storehouse-smart" - }, }) diff --git a/prototypes/technology.lua b/prototypes/technology.lua index cd409fc7..48094f54 100644 --- a/prototypes/technology.lua +++ b/prototypes/technology.lua @@ -82,33 +82,5 @@ data:extend( }, order = "c-k-a" }, - { - type = "technology", - name = "warehouse-smart-research", - icon = "__Warehousing__/graphics/research/warehouse-smart-research.png", - icon_size = 128, - effects = - { - { - type = "unlock-recipe", - recipe = "warehouse-smart", - }, - { - type = "unlock-recipe", - recipe = "storehouse-smart", - }, - }, - prerequisites = { "circuit-network", "warehouse-research" }, - unit = - { - count = 25, - ingredients = { - { "science-pack-1", 1}, - { "science-pack-2", 1} - }, - time = 15 - }, - order = "a-d-d" - }, })