diff --git a/bobgreenhouse/locale/en/bobgreenhouse.cfg b/bobgreenhouse/locale/en/bobgreenhouse.cfg index e6834d18f..34c23e3aa 100644 --- a/bobgreenhouse/locale/en/bobgreenhouse.cfg +++ b/bobgreenhouse/locale/en/bobgreenhouse.cfg @@ -7,7 +7,9 @@ wood-pellets=Wood fuel pellets [recipe-name] bob-basic-greenhouse-cycle=Grow trees -bob-advanced-greenhouse-cycle=Grow trees with Fertiliser +bob-advanced-greenhouse-cycle=Grow trees with fertiliser +bob-fertiliser=Fertiliser +bob-seedling=Germinate seedlings [entity-name] diff --git a/bobgreenhouse/prototypes/entities.lua b/bobgreenhouse/prototypes/entities.lua index 4a1744040..13366acb2 100644 --- a/bobgreenhouse/prototypes/entities.lua +++ b/bobgreenhouse/prototypes/entities.lua @@ -1,3 +1,11 @@ +circuit_connector_definitions["bob-greenhouse"] = + circuit_connector_definitions.create_vector(universal_connector_template, { + { variation = 27, main_offset = util.by_pixel(30.5, 15.5), shadow_offset = util.by_pixel(37, 20.5), show_shadow = false }, + { variation = 27, main_offset = util.by_pixel(30.5, 15.5), shadow_offset = util.by_pixel(37, 20.5), show_shadow = false }, + { variation = 27, main_offset = util.by_pixel(30.5, 15.5), shadow_offset = util.by_pixel(37, 20.5), show_shadow = false }, + { variation = 27, main_offset = util.by_pixel(30.5, 15.5), shadow_offset = util.by_pixel(37, 20.5), show_shadow = false }, + }) + data:extend({ { type = "assembling-machine", @@ -9,6 +17,8 @@ data:extend({ collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, max_health = 250, + circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance, + circuit_connector = circuit_connector_definitions["bob-greenhouse"], corpse = "big-remnants", dying_explosion = "medium-explosion", fast_replaceable_group = "bob-greenhouse", @@ -17,7 +27,7 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = -10, + emissions_per_minute = { pollution = -10 }, }, energy_usage = "100kW", --"25kW", resistances = { @@ -31,12 +41,12 @@ data:extend({ production_type = "input", pipe_picture = assembler3pipepictures(), pipe_covers = pipecoverspictures(), - base_area = 10, - base_level = -1, - pipe_connections = { { type = "input", position = { 0, -2 } } }, + volume = 1000, + pipe_connections = { { flow_direction = "input", position = { 0, -1 }, direction = defines.direction.north } }, + secondary_draw_orders = { north = -1 }, }, }, - allowed_effects = { "consumption", "speed", "productivity", "pollution" }, + allowed_effects = {}, graphics_set = { animation = { filename = "__bobgreenhouse__/graphics/entity/greenhouse.png", @@ -60,6 +70,6 @@ data:extend({ }, open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 }, + impact_category = "glass", }, }) diff --git a/bobgreenhouse/prototypes/items.lua b/bobgreenhouse/prototypes/items.lua index 744981ce3..326e2b8e7 100644 --- a/bobgreenhouse/prototypes/items.lua +++ b/bobgreenhouse/prototypes/items.lua @@ -8,6 +8,21 @@ data:extend({ order = "g[greenhouse]", place_result = "bob-greenhouse", stack_size = 20, + drop_sound = { + filename = "__base__/sound/item/wood-inventory-move.ogg", + volume = 0.85, + speed = 1.6, + }, + inventory_move_sound = { + filename = "__base__/sound/item/wood-inventory-move.ogg", + volume = 0.85, + speed = 1.6, + }, + pick_sound = { + filename = "__base__/sound/item/wood-inventory-pickup.ogg", + volume = 0.85, + speed = 1.6, + }, }, { type = "item", @@ -17,6 +32,21 @@ data:extend({ subgroup = "bob-greenhouse-items", order = "g[fertiliser]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/low-density-inventory-pickup.ogg", + volume = 0.65, + speed = 0.7, + }, + inventory_move_sound = { + filename = "__base__/sound/item/low-density-inventory-pickup.ogg", + volume = 0.65, + speed = 0.7, + }, + pick_sound = { + filename = "__base__/sound/item/wire-inventory-move.ogg", + volume = 0.7, + speed = 0.6, + }, }, { type = "item", @@ -28,6 +58,21 @@ data:extend({ subgroup = "bob-greenhouse-items", order = "a[seedling]", stack_size = 200, + drop_sound = { + filename = "__base__/sound/item/resource-inventory-move.ogg", + volume = 0.9, + speed = 1.5, + }, + inventory_move_sound = { + filename = "__base__/sound/item/resource-inventory-move.ogg", + volume = 0.9, + speed = 1.5, + }, + pick_sound = { + filename = "__base__/sound/item/wire-inventory-pickup.ogg", + volume = 0.9, + speed = 0.6, + }, }, { type = "item", @@ -40,5 +85,20 @@ data:extend({ subgroup = "raw-resource", order = "a[wood-pellets]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/low-density-inventory-pickup.ogg", + volume = 0.65, + speed = 0.7, + }, + inventory_move_sound = { + filename = "__base__/sound/item/low-density-inventory-pickup.ogg", + volume = 0.65, + speed = 0.7, + }, + pick_sound = { + filename = "__base__/sound/item/wire-inventory-move.ogg", + volume = 0.7, + speed = 0.6, + }, }, }) diff --git a/bobgreenhouse/prototypes/recipes.lua b/bobgreenhouse/prototypes/recipes.lua index 4199e95fa..0da61dcab 100644 --- a/bobgreenhouse/prototypes/recipes.lua +++ b/bobgreenhouse/prototypes/recipes.lua @@ -59,7 +59,6 @@ data:extend({ { type = "item", name = "wood", amount_min = 10, amount_max = 20 }, }, allow_decomposition = false, - allow_productivity = true, }, { @@ -80,7 +79,6 @@ data:extend({ { type = "item", name = "wood", amount_min = 10, amount_max = 50 }, }, allow_decomposition = false, - allow_productivity = true, }, { diff --git a/bobgreenhouse/prototypes/technology.lua b/bobgreenhouse/prototypes/technology.lua index d631bce36..8b2cb5df2 100644 --- a/bobgreenhouse/prototypes/technology.lua +++ b/bobgreenhouse/prototypes/technology.lua @@ -5,7 +5,7 @@ data:extend({ icon = "__bobgreenhouse__/graphics/icons/technology/greenhouse.png", icon_size = 128, prerequisites = { - "steam-power", + "automation-science-pack", }, effects = { {