diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua b/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua index 802b535..2dc1475 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua @@ -12,29 +12,17 @@ if BI.Settings.Bio_Cannon then return { layers = { { - priority = "high", - width = 346, - height = 336, - direction_count = 1, - frame_count = 12, - line_length = 6, - run_mode = "forward", - axially_symmetrical = false, - shift = {0, -0.8}, - filename = ENTITYPATH .. "bio_cannon_anim.png", - hr_version = { priority = "high", width = 692, height = 672, - direction_count = 1, - frame_count = 12, - line_length = 6, + direction_count = 1, + frame_count = 12, + line_length = 6, run_mode = "forward", axially_symmetrical = false, shift = {0, -0.8}, filename = ENTITYPATH .. "hr_bio_cannon_anim.png", scale = 0.5 - } } } @@ -46,51 +34,28 @@ if BI.Settings.Bio_Cannon then return { layers = { { - priority = "high", - width = 346, - height = 336, - direction_count = 1, - frame_count = 1, - line_length = 1, - axially_symmetrical = false, - shift = {0, -0.8}, - filename = ENTITYPATH .. "bio_cannon_open.png", - hr_version = { priority = "high", width = 692, height = 672, - direction_count = 1, - frame_count = 1, - line_length = 1, + direction_count = 1, + frame_count = 1, + line_length = 1, axially_symmetrical = false, shift = {0, -0.8}, filename = ENTITYPATH .. "hr_bio_cannon_open.png", scale = 0.5 - } }, { - priority = "high", - width = 160, - height = 336, - direction_count = 1, - frame_count = 1, - line_length = 1, - axially_symmetrical = false, - shift = {5, -0.95}, - filename = ENTITYPATH .. "bio_cannon_shadow.png", - draw_as_shadow = true, - hr_version = { priority = "high", width = 320, height = 672, - direction_count = 1, - frame_count = 1, - line_length = 1, + direction_count = 1, + frame_count = 1, + line_length = 1, axially_symmetrical = false, shift = {5, -0.95}, filename = ENTITYPATH .. "hr_bio_cannon_shadow.png", draw_as_shadow = true, scale = 0.5 - } } } } @@ -101,29 +66,17 @@ if BI.Settings.Bio_Cannon then layers = { { - priority = "high", - width = 346, - height = 336, - direction_count = 1, - frame_count = 12, - line_length = 6, - run_mode = "backward", - axially_symmetrical = false, - shift = {0, -0.8}, - filename = ENTITYPATH .. "bio_cannon_anim.png", - hr_version = { priority = "high", width = 692, height = 672, - direction_count = 1, - frame_count = 12, - line_length = 6, + direction_count = 1, + frame_count = 12, + line_length = 6, run_mode = "backward", axially_symmetrical = false, shift = {0, -0.8}, filename = ENTITYPATH .. "hr_bio_cannon_anim.png", scale = 0.5 - } } } @@ -134,55 +87,28 @@ if BI.Settings.Bio_Cannon then return { layers = { { - priority = "high", - width = 346, - height = 336, - direction_count = 1, - frame_count = 1, - line_length = 1, - axially_symmetrical = false, - shift = {0, -0.8}, - filename = ENTITYPATH .. "bio_cannon_anim.png", - - hr_version = { priority = "high", width = 692, height = 672, - direction_count = 1, - frame_count = 1, - line_length = 1, + direction_count = 1, + frame_count = 1, + line_length = 1, axially_symmetrical = false, shift = {0, -0.8}, filename = ENTITYPATH .. "hr_bio_cannon_anim.png", scale = 0.5 - } - }, { - priority = "high", - width = 346, - height = 336, - direction_count = 1, - frame_count = 1, - line_length = 1, - axially_symmetrical = false, - shift = {0.2, -0.95}, - filename = ENTITYPATH .. "bio_cannon_shadow.png", - draw_as_shadow = true, - - hr_version = { priority = "high", width = 692, height = 672, - direction_count = 1, - frame_count = 1, - line_length = 1, + direction_count = 1, + frame_count = 1, + line_length = 1, axially_symmetrical = false, shift = {0.2, -0.95}, filename = ENTITYPATH .. "hr_bio_cannon_shadow.png", draw_as_shadow = true, scale = 0.5 - } - } } } @@ -243,8 +169,8 @@ if BI.Settings.Bio_Cannon then folded_animation = folded_animation(), call_for_help_radius = 90, attack_target_mask = {"Bio_Cannon_Ammo"} - }, - + }, + ---- Corpse / Remnants { type = "corpse", @@ -266,17 +192,6 @@ if BI.Settings.Bio_Cannon then layers = { { - - width = 346, - height = 336, - direction_count = 1, - frame_count = 1, - line_length = 1, - axially_symmetrical = false, - shift = {0, -0.8}, - filename = REMNANTSPATH .. "bio_cannon_remnant.png", - - hr_version = { width = 692, height = 672, direction_count = 1, @@ -286,7 +201,6 @@ if BI.Settings.Bio_Cannon then shift = {0, -0.8}, filename = REMNANTSPATH .. "hr_bio_cannon_remnant.png", scale = 0.5 - } } } diff --git a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua index f28313e..69017fe 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua @@ -905,75 +905,6 @@ data:extend({ } }, - --~ --- Arboretum - --~ --- Radar Arboretum - --~ { - --~ type = "radar", - --~ name = "bi-arboretum-hidden-radar", - --~ localised_name = {"entity-name.bi-arboretum"}, - --~ localised_description = {"entity-description.bi-arboretum"}, - --~ icon = ICONPATH .. "Arboretum_Icon.png", - --~ icon_size = 64, - --~ icons = { - --~ { - --~ icon = ICONPATH .. "Arboretum_Icon.png", - --~ icon_size = 64, - --~ } - --~ }, - --~ flags = {"placeable-player", "player-creation", "not-deconstructable"}, - --~ order = "y[bi]-a[bi-arboretum]", - --~ minable = nil, - --~ max_health = 250, - --~ corpse = "big-remnants", - --~ dying_explosion = "medium-explosion", - --~ resistances = { - --~ { - --~ type = "fire", - --~ percent = 70 - --~ } - --~ }, - --~ collision_box = {{-0.70, -0.70}, {0.70, 0.70}}, - --~ selection_box = {{-0.75, -0.75}, {0.75, 0.75}}, - - --~ energy_per_sector = "2MJ", - --~ max_distance_of_nearby_sector_revealed = 2, - --~ max_distance_of_sector_revealed = 5, - --~ energy_per_nearby_scan = "200kW", - --~ energy_source = { - --~ type = "electric", - --~ usage_priority = "secondary-input", - --~ emissions_per_minute = 0, - --~ }, - --~ energy_usage = "150kW", - --~ pictures = { - --~ layers = { - --~ { - --~ filename = "__base__/graphics/entity/radar/radar.png", - --~ priority = "extra-high", - --~ width = 98, - --~ height = 128, - --~ apply_projection = false, - --~ direction_count = 64, - --~ line_length = 8, - --~ shift = util.by_pixel(1, -16), - --~ scale = 0.5, - --~ hr_version = { - --~ filename = "__base__/graphics/entity/radar/hr-radar.png", - --~ priority = "extra-high", - --~ width = 196, - --~ height = 254, - --~ apply_projection = false, - --~ direction_count = 64, - --~ line_length = 8, - --~ shift = util.by_pixel(1, -16), - --~ scale = 0.25 - --~ } - --~ }, - --~ } - --~ }, - --~ }, - - ---- Arboretum Area Overlay { type = "ammo-turret", diff --git a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua index a8a94bf..059b080 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua @@ -7,64 +7,36 @@ function assembler2pipepicturesCokery() return { north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - shift = util.by_pixel(2.5, 14), - hr_version = { filename = ICONPATH .. "empty.png", priority = "extra-high", width = 1, height = 1, shift = util.by_pixel(2.25, 13.5), scale = 0.5, - } }, east = { - filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-E.png", - priority = "extra-high", - width = 20, - height = 38, - shift = util.by_pixel(-25, 1), - hr_version = { filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-E.png", priority = "extra-high", width = 42, height = 76, shift = util.by_pixel(-24.5, 1), scale = 0.5, - } }, south = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - shift = util.by_pixel(0, -31.5), - hr_version = { filename = ICONPATH .. "empty.png", priority = "extra-high", width = 1, height = 1, shift = util.by_pixel(0, -31.25), scale = 0.5, - } }, west = { - filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-W.png", - priority = "extra-high", - width = 19, - height = 37, - shift = util.by_pixel(25.5, 1.5), - hr_version = { filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-W.png", priority = "extra-high", width = 39, height = 73, shift = util.by_pixel(25.75, 1.25), scale = 0.5, - } } } end @@ -108,56 +80,32 @@ end function pipecoverspicturesCokery() return { north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - hr_version = { filename = ICONPATH .. "empty.png", priority = "extra-high", width = 1, height = 1, scale = 0.5 - } }, east = { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-east.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, south = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - hr_version = { filename = ICONPATH .. "empty.png", priority = "extra-high", width = 1, height = 1, scale = 0.5 - } }, west = { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-west.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } } } end @@ -167,64 +115,36 @@ function assembler2pipepicturesBioreactor() return { north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - shift = util.by_pixel(2.5, 14), - hr_version = { filename = ICONPATH .. "empty.png", priority = "extra-high", width = 71, height = 38, shift = util.by_pixel(2.25, 13.5), scale = 0.5, - } }, east = { - filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-E.png", - priority = "extra-high", - width = 20, - height = 38, - shift = util.by_pixel(-25, 1), - hr_version = { filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-E.png", priority = "extra-high", width = 42, height = 76, shift = util.by_pixel(-24.5, 1), scale = 0.5, - } }, south = { - filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-S.png", - priority = "extra-high", - width = 44, - height = 31, - shift = util.by_pixel(0, -31.5), - hr_version = { filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-S.png", priority = "extra-high", width = 88, height = 61, shift = util.by_pixel(0, -31.25), scale = 0.5, - } }, west = { - filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-W.png", - priority = "extra-high", - width = 19, - height = 37, - shift = util.by_pixel(25.5, 1.5), - hr_version = { filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-W.png", priority = "extra-high", width = 39, height = 73, shift = util.by_pixel(25.75, 1.25), scale = 0.5, - } } } end @@ -234,56 +154,32 @@ end function pipecoverspicturesBioreactor() return { north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - hr_version = { filename = ICONPATH .. "empty.png", priority = "extra-high", width = 1, height = 1, scale = 0.5 - } }, east = { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-east.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, south = { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-south.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, west = { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-west.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } } } @@ -294,60 +190,32 @@ function BioFarm_Pipe_Connectors_Left() return { north = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_l.png", - priority = "extra-high", - width = 51, - height = 35, - shift = {0.25, 1}, - hr_version = { filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_l.png", priority = "extra-high", width = 51, height = 35, shift = {0.25, 1}, - } }, east = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_l.png", - priority = "extra-high", - width = 18, - height = 48, - shift = {-1, -0.25}, - hr_version = { filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_l.png", priority = "extra-high", width = 18, height = 48, shift = {-1, -0.25}, - } }, south = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_l.png", - priority = "extra-high", - width = 49, - height = 25, - shift = {0.5, -1}, - hr_version = { filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_l.png", priority = "extra-high", width = 49, height = 25, shift = {0.5, -1}, - } }, west = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_l.png", - priority = "extra-high", - width = 16, - height = 51, - shift = {0.5, 0.5}, - hr_version = { filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_l.png", priority = "extra-high", width = 16, height = 51, shift = {0.5, 0.5}, - } } } end @@ -357,58 +225,32 @@ function bio_farm_pipe_pictures() return { north = { - filename = "__base__/graphics/entity/assembling-machine-3/assembling-machine-3-pipe-N.png", - priority = "extra-high", - width = 35, - height = 18, - shift = util.by_pixel(2.5, 14), - hr_version = { filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-N.png", priority = "extra-high", width = 71, height = 38, shift = util.by_pixel(2.25, 13.5), scale = 0.5, - } }, east = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - hr_version = { filename = ICONPATH .. "empty.png", priority = "extra-high", width = 1, height = 1, - } }, south = { - filename = "__base__/graphics/entity/assembling-machine-3/assembling-machine-3-pipe-S.png", - priority = "extra-high", - width = 44, - height = 31, - shift = util.by_pixel(0, -31.5), - hr_version = { filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-S.png", priority = "extra-high", width = 88, height = 61, shift = util.by_pixel(0, -31.25), scale = 0.5, - } }, west = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - hr_version = { filename = ICONPATH .. "empty.png", priority = "extra-high", width = 1, height = 1, - } } } end @@ -418,60 +260,33 @@ bio_farm_pipe_covers_pictures = function() north = { layers = { { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-north.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-north-shadow.png", - priority = "extra-high", - width = 64, - height = 64, - draw_as_shadow = true, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north-shadow.png", priority = "extra-high", width = 128, height = 128, scale = 0.5, draw_as_shadow = true - } }, }, }, east = { layers = { { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-east.png", - priority = "extra-high", - width = 64, - height = 64, - shift = {-0.22, 0}, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png", priority = "extra-high", width = 128, height = 128, shift = {-0.22, 0}, scale = 0.5 - } }, { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-east-shadow.png", - priority = "extra-high", - width = 64, - height = 64, - shift = {-0.22, 0}, - draw_as_shadow = true, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east-shadow.png", priority = "extra-high", width = 128, @@ -479,67 +294,39 @@ bio_farm_pipe_covers_pictures = function() scale = 0.5, shift = {-0.22, 0}, draw_as_shadow = true - } }, }, }, south = { layers = { { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-south.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-south-shadow.png", - priority = "extra-high", - width = 64, - height = 64, - draw_as_shadow = true, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south-shadow.png", priority = "extra-high", width = 128, height = 128, scale = 0.5, draw_as_shadow = true - } }, }, }, west = { layers = { { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-west.png", - priority = "extra-high", - width = 64, - height = 64, - shift = {0.2, 0}, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png", priority = "extra-high", width = 128, height = 128, shift = {0.2, 0}, scale = 0.5 - } }, { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-west-shadow.png", - priority = "extra-high", - width = 64, - height = 64, - shift = {0.2, 0}, - draw_as_shadow = true, - hr_version = { filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west-shadow.png", priority = "extra-high", width = 128, @@ -547,77 +334,8 @@ bio_farm_pipe_covers_pictures = function() scale = 0.5, shift = {0.2, 0}, draw_as_shadow = true - } }, }, } } -end - - - - ---[[ -function BioFarm_Pipe_Connectors_Right() - return - { - north = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_r.png", - priority = "extra-high", - width = 51, - height = 35, - --shift = util.by_pixel(2.5, 14), - shift = {-4, -4}, - hr_version = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_r.png", - priority = "extra-high", - width = 51, - height = 35, - shift = {0.5, 0.5}, - } - }, - east = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_r.png", - priority = "extra-high", - width = 18, - height = 48, - shift = {-0.5, 0.5}, - hr_version = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_r.png", - priority = "extra-high", - width = 18, - height = 48, - shift = {-0.5, 0.5}, - } - }, - south = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_r.png", - priority = "extra-high", - width = 49, - height = 25, - shift = {0.5, -0.5}, - hr_version = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_r.png", - priority = "extra-high", - width = 49, - height = 25, - shift = {0.5, -0.5}, - } - }, - west = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_r.png", - priority = "extra-high", - width = 16, - height = 51, - shift = {-0.5, -0.5}, - hr_version = { - filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_r.png", - priority = "extra-high", - width = 16, - height = 51, - shift = {-0.5, -0.5}, - } - } - } -end -]] +end \ No newline at end of file diff --git a/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua index dde51ea..5817ec7 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua @@ -22,33 +22,27 @@ for i = 1, TREE_LEVELS do wooden.name = "bio-" .. wooden.name .. "-" .. i for _, pic in pairs(wooden.pictures) do pic.scale = (pic.scale or 1)/TREE_LEVELS*i - pic.hr_version.scale = (pic.hr_version.scale or 1)/TREE_LEVELS*i end for _, pic in pairs(wooden.shadows) do pic.scale = (pic.scale or 1)/TREE_LEVELS*i - pic.hr_version.scale = (pic.hr_version.scale or 1)/TREE_LEVELS*i end branch = table.deepcopy(data.raw["optimized-particle"]["branch-particle"]) branch.name = "bio-" .. branch.name .. "-" .. i for _, pic in pairs(branch.pictures) do pic.scale = (pic.scale or 1)/TREE_LEVELS*i - pic.hr_version.scale = (pic.hr_version.scale or 1)/TREE_LEVELS*i end for _, pic in pairs(branch.shadows) do pic.scale = (pic.scale or 1)/TREE_LEVELS*i - pic.hr_version.scale = (pic.hr_version.scale or 1)/TREE_LEVELS*i end leaf = table.deepcopy(data.raw["optimized-particle"]["leaf-particle"]) leaf.name = "bio-" .. leaf.name .. "-" .. i for _, pic in pairs(leaf.pictures) do pic.scale = (pic.scale or 1)/TREE_LEVELS*math.max(2, i) - --pic.hr_version.scale = (pic.hr_version.scale or 1)/TREE_LEVELS*i end for _, pic in pairs(leaf.shadows) do pic.scale = (pic.scale or 1)/TREE_LEVELS*math.max(2, i) - --pic.hr_version.scale = (pic.hr_version.scale or 1)/TREE_LEVELS*i end data:extend({wooden, branch, leaf}) @@ -124,16 +118,6 @@ for id, prototype in pairs(data.raw.tree) do variation.trunk.shift[2] = variation.trunk.shift[2]/TREE_LEVELS*i end - if variation.trunk.hr_version then - variation.trunk.hr_version.scale = (variation.trunk.hr_version.scale or 1) * i / TREE_LEVELS - - if variation.trunk.hr_version.shift then - variation.trunk.hr_version.shift[1] = (variation.trunk.hr_version.shift[1] or 0)/TREE_LEVELS*i - variation.trunk.hr_version.shift[2] = (variation.trunk.hr_version.shift[2] or 0)/TREE_LEVELS*i - - end - end - -- This doesn't make sense, the condition can never be true! Either more -- than 4 levels have been used originally, or it should be compared to just -- TREE_LEVELS, not TREE_LEVELS/10 (i.e. typo) @@ -169,14 +153,6 @@ for id, prototype in pairs(data.raw.tree) do variation.leaves.shift[2] = (variation.leaves.shift[2] or 0)/TREE_LEVELS*i end - if variation.leaves.hr_version then - variation.leaves.hr_version.scale = (variation.leaves.hr_version.scale or 1) * i / TREE_LEVELS - if variation.leaves.hr_version.shift then - variation.leaves.hr_version.shift[1] = (variation.leaves.hr_version.shift[1] or 0)/TREE_LEVELS*i - variation.leaves.hr_version.shift[2] = (variation.leaves.hr_version.shift[2] or 0)/TREE_LEVELS*i - end - end - variation.leaf_generation.scale = (variation.leaf_generation.scale or 1) * i / TREE_LEVELS variation.leaf_generation.offset_deviation = {{-0.5, -0.5}, {0.5, 0.5}} variation.leaf_generation.initial_height = 2/TREE_LEVELS*i @@ -196,14 +172,6 @@ for id, prototype in pairs(data.raw.tree) do variation.shadow.shift[1] = (variation.shadow.shift[1] or 0)/TREE_LEVELS*i variation.shadow.shift[2] = (variation.shadow.shift[2] or 0)/TREE_LEVELS*i end - - if variation.shadow.hr_version then - variation.shadow.hr_version.scale = (variation.shadow.hr_version.scale or 1) * i / TREE_LEVELS - if variation.shadow.hr_version.shift then - variation.shadow.hr_version.shift[1] = (variation.shadow.hr_version.shift[1] or 0)/TREE_LEVELS*i - variation.shadow.hr_version.shift[2] = (variation.shadow.hr_version.shift[2] or 0)/TREE_LEVELS*i - end - end end @@ -219,7 +187,6 @@ for id, prototype in pairs(data.raw.tree) do for _, variation in pairs(stump.animation) do variation.scale = (variation.scale or 1) * i / TREE_LEVELS - variation.hr_version = nil variation.shift[1] = variation.shift[1]/TREE_LEVELS*i variation.shift[2] = variation.shift[2]/TREE_LEVELS*i diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua index 39af0a7..d235adc 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua @@ -211,13 +211,6 @@ if BI.Settings.BI_Bio_Fuel then north = { layers = { { - filename = ENTITYPATH .. "boiler-N-idle.png", - priority = "extra-high", - width = 131, - height = 108, - tint = bio_boiler_tint, - shift = util.by_pixel(-0.5, 4), - hr_version = { filename = ENTITYPATH .. "hr-boiler-N-idle.png", priority = "extra-high", width = 269, @@ -225,16 +218,8 @@ if BI.Settings.BI_Bio_Fuel then shift = util.by_pixel(-1.25, 5.25), scale = 0.5, tint = bio_boiler_tint, - } }, { - filename = ENTITYPATH .. "boiler-N-shadow.png", - priority = "extra-high", - width = 137, - height = 82, - shift = util.by_pixel(20.5, 9), - draw_as_shadow = true, - hr_version = { filename = ENTITYPATH .. "hr-boiler-N-shadow.png", priority = "extra-high", width = 274, @@ -242,20 +227,12 @@ if BI.Settings.BI_Bio_Fuel then scale = 0.5, shift = util.by_pixel(20.5, 9), draw_as_shadow = true, - } } } }, east = { layers = { { - filename = ENTITYPATH .. "boiler-E-idle.png", - priority = "extra-high", - width = 105, - height = 147, - tint = bio_boiler_tint, - shift = util.by_pixel(-3.5, -0.5), - hr_version = { filename = ENTITYPATH .. "hr-boiler-E-idle.png", priority = "extra-high", width = 216, @@ -263,16 +240,8 @@ if BI.Settings.BI_Bio_Fuel then shift = util.by_pixel(-3, 1.25), scale = 0.5, tint = bio_boiler_tint, - } }, { - filename = ENTITYPATH .. "boiler-E-shadow.png", - priority = "extra-high", - width = 92, - height = 97, - shift = util.by_pixel(30, 9.5), - draw_as_shadow = true, - hr_version = { filename = ENTITYPATH .. "hr-boiler-E-shadow.png", priority = "extra-high", width = 184, @@ -280,20 +249,12 @@ if BI.Settings.BI_Bio_Fuel then scale = 0.5, shift = util.by_pixel(30, 9.5), draw_as_shadow = true, - } } } }, south = { layers = { { - filename = ENTITYPATH .. "boiler-S-idle.png", - priority = "extra-high", - width = 128, - height = 95, - tint = bio_boiler_tint, - shift = util.by_pixel(3, 12.5), - hr_version = { filename = ENTITYPATH .. "hr-boiler-S-idle.png", priority = "extra-high", width = 260, @@ -301,16 +262,8 @@ if BI.Settings.BI_Bio_Fuel then shift = util.by_pixel(4, 13), scale = 0.5, tint = bio_boiler_tint, - } }, { - filename = ENTITYPATH .. "boiler-S-shadow.png", - priority = "extra-high", - width = 156, - height = 66, - shift = util.by_pixel(30, 16), - draw_as_shadow = true, - hr_version = { filename = ENTITYPATH .. "hr-boiler-S-shadow.png", priority = "extra-high", width = 311, @@ -318,20 +271,12 @@ if BI.Settings.BI_Bio_Fuel then scale = 0.5, shift = util.by_pixel(29.75, 15.75), draw_as_shadow = true, - } } } }, west = { layers = { { - filename = ENTITYPATH .. "boiler-W-idle.png", - priority = "extra-high", - width = 96, - height = 132, - tint = bio_boiler_tint, - shift = util.by_pixel(1, 5), - hr_version = { filename = ENTITYPATH .. "hr-boiler-W-idle.png", priority = "extra-high", width = 196, @@ -339,16 +284,8 @@ if BI.Settings.BI_Bio_Fuel then shift = util.by_pixel(1.5, 7.75), scale = 0.5, tint = bio_boiler_tint, - } }, { - filename = ENTITYPATH .. "boiler-W-shadow.png", - priority = "extra-high", - width = 103, - height = 109, - shift = util.by_pixel(19.5, 6.5), - draw_as_shadow = true, - hr_version = { filename = ENTITYPATH .. "hr-boiler-W-shadow.png", priority = "extra-high", width = 206, @@ -356,41 +293,23 @@ if BI.Settings.BI_Bio_Fuel then scale = 0.5, shift = util.by_pixel(19.5, 6.5), draw_as_shadow = true, - } } } } }, patch = { east = { - filename = ENTITYPATH .. "boiler-E-patch.png", - priority = "extra-high", - width = 3, - height = 17, - tint = bio_boiler_tint, - shift = util.by_pixel(33.5, -13.5), - hr_version = { filename = ENTITYPATH .. "hr-boiler-E-patch.png", width = 6, height = 36, shift = util.by_pixel(33.5, -13.5), scale = 0.5, tint = bio_boiler_tint, - } }, }, fire_flicker_enabled = true, fire = { north = { - filename = ENTITYPATH .. "boiler-N-fire.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 12, - height = 13, - animation_speed = 0.5, - shift = util.by_pixel(0, -8.5), - hr_version = { filename = ENTITYPATH .. "hr-boiler-N-fire.png", priority = "extra-high", frame_count = 64, @@ -400,18 +319,8 @@ if BI.Settings.BI_Bio_Fuel then animation_speed = 0.5, shift = util.by_pixel(0, -8.5), scale = 0.5 - } }, east = { - filename = ENTITYPATH .. "boiler-E-fire.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 14, - height = 14, - animation_speed = 0.5, - shift = util.by_pixel(-10, -22), - hr_version = { filename = ENTITYPATH .. "hr-boiler-E-fire.png", priority = "extra-high", frame_count = 64, @@ -421,18 +330,8 @@ if BI.Settings.BI_Bio_Fuel then animation_speed = 0.5, shift = util.by_pixel(-9.5, -22), scale = 0.5 - } }, south = { - filename = ENTITYPATH .. "boiler-S-fire.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 12, - height = 9, - animation_speed = 0.5, - shift = util.by_pixel(-1, -26.5), - hr_version = { filename = ENTITYPATH .. "hr-boiler-S-fire.png", priority = "extra-high", frame_count = 64, @@ -442,18 +341,8 @@ if BI.Settings.BI_Bio_Fuel then animation_speed = 0.5, shift = util.by_pixel(-1, -26.5), scale = 0.5 - } }, west = { - filename = ENTITYPATH .. "boiler-W-fire.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 14, - height = 14, - animation_speed = 0.5, - shift = util.by_pixel(13, -23), - hr_version = { filename = ENTITYPATH .. "hr-boiler-W-fire.png", priority = "extra-high", frame_count = 64, @@ -463,20 +352,11 @@ if BI.Settings.BI_Bio_Fuel then animation_speed = 0.5, shift = util.by_pixel(13, -23.25), scale = 0.5 - } } }, fire_glow_flicker_enabled = true, fire_glow = { north = { - filename = ENTITYPATH .. "boiler-N-light.png", - priority = "extra-high", - frame_count = 1, - width = 100, - height = 87, - shift = util.by_pixel(-1, -6.5), - blend_mode = "additive", - hr_version = { filename = ENTITYPATH .. "hr-boiler-N-light.png", priority = "extra-high", frame_count = 1, @@ -485,17 +365,8 @@ if BI.Settings.BI_Bio_Fuel then shift = util.by_pixel(-1, -6.75), blend_mode = "additive", scale = 0.5 - } }, east = { - filename = ENTITYPATH .. "boiler-E-light.png", - priority = "extra-high", - frame_count = 1, - width = 70, - height = 122, - shift = util.by_pixel(0, -13), - blend_mode = "additive", - hr_version = { filename = ENTITYPATH .. "hr-boiler-E-light.png", priority = "extra-high", frame_count = 1, @@ -504,17 +375,8 @@ if BI.Settings.BI_Bio_Fuel then shift = util.by_pixel(0.25, -13), blend_mode = "additive", scale = 0.5 - } }, south = { - filename = ENTITYPATH .. "boiler-S-light.png", - priority = "extra-high", - frame_count = 1, - width = 100, - height = 81, - shift = util.by_pixel(1, 5.5), - blend_mode = "additive", - hr_version = { filename = ENTITYPATH .. "hr-boiler-S-light.png", priority = "extra-high", frame_count = 1, @@ -523,17 +385,8 @@ if BI.Settings.BI_Bio_Fuel then shift = util.by_pixel(1, 5.5), blend_mode = "additive", scale = 0.5 - } }, west = { - filename = ENTITYPATH .. "boiler-W-light.png", - priority = "extra-high", - frame_count = 1, - width = 68, - height = 109, - shift = util.by_pixel(2, -6.5), - blend_mode = "additive", - hr_version = { filename = ENTITYPATH .. "hr-boiler-W-light.png", priority = "extra-high", frame_count = 1, @@ -542,7 +395,6 @@ if BI.Settings.BI_Bio_Fuel then shift = util.by_pixel(2, -6.25), blend_mode = "additive", scale = 0.5 - } } }, burning_cooldown = 20 diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua index a52f45f..2cc6bc3 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua @@ -7,64 +7,36 @@ local PIPEPATH = "__base__/graphics/entity/pipe-covers/" function assembler2pipepicturesBioreactor() return { north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - shift = util.by_pixel(2.5, 14), - hr_version = { filename = ICONPATH .. "empty.png", priority = "extra-high", width = 1, height = 1, shift = util.by_pixel(2.25, 13.5), scale = 0.5, - } }, east = { - filename = ENTITYPATH .. "assembling-machine-2-pipe-E.png", - priority = "extra-high", - width = 20, - height = 38, - shift = util.by_pixel(-25, 1), - hr_version = { filename = ENTITYPATH .. "hr-assembling-machine-2-pipe-E.png", priority = "extra-high", width = 42, height = 76, shift = util.by_pixel(-24.5, 1), scale = 0.5, - } }, south = { - filename = ENTITYPATH .. "assembling-machine-2-pipe-S.png", - priority = "extra-high", - width = 44, - height = 31, - shift = util.by_pixel(0, -31.5), - hr_version = { filename = ENTITYPATH .. "hr-assembling-machine-2-pipe-S.png", priority = "extra-high", width = 88, height = 61, shift = util.by_pixel(0, -31.25), scale = 0.5, - } }, west = { - filename = ENTITYPATH .. "assembling-machine-2-pipe-W.png", - priority = "extra-high", - width = 19, - height = 37, - shift = util.by_pixel(25.5, 1.5), - hr_version = { filename = ENTITYPATH .. "hr-assembling-machine-2-pipe-W.png", priority = "extra-high", width = 39, height = 73, shift = util.by_pixel(25.75, 1.25), scale = 0.5, - } } } end @@ -73,56 +45,32 @@ end function pipecoverspicturesBioreactor() return { north = { - filename = ICONPATH .. "empty.png", - priority = "extra-high", - width = 1, - height = 1, - hr_version = { filename = ICONPATH .. "empty.png", priority = "extra-high", width = 1, height = 1, scale = 0.5 - } }, east = { - filename = PIPEPATH .. "pipe-cover-east.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-cover-east.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, south = { - filename = PIPEPATH .. "pipe-cover-south.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-cover-south.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } }, west = { - filename = PIPEPATH .. "pipe-cover-west.png", - priority = "extra-high", - width = 64, - height = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-cover-west.png", priority = "extra-high", width = 128, height = 128, scale = 0.5 - } } } end diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua index 153f130..f1a7177 100644 --- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua @@ -269,14 +269,6 @@ data:extend({ size = 1, probability = 1, }, - --[[ - { - picture = ENTITYPATH .. "solar2.png", - count = 1, - size = 2, - probability = 1, - }, - ]] }, inner_corner = { picture = ENTITYPATH .. "solar-inner-corner.png", @@ -306,228 +298,7 @@ data:extend({ }, }) - --~ ------- Hidden Electric pole for Solar Mat ---~ local hidden_pole = table.deepcopy(data.raw["electric-pole"]["small-electric-pole"]) ---~ { --- type = "electric-pole", --- name = "bi-musk-mat-hidden-pole", --- icon = ICONPATH .. "solar-mat.png", --- icon_size = 64, --- icons = { --- { --- icon = ICONPATH .. "solar-mat.png", --- icon_size = 64, --- } --- }, --- flags = {"not-blueprintable", "not-deconstructable", "placeable-off-grid", "not-on-map", "not-repairable"}, --- selectable_in_game = false, --- draw_copper_wires = false, --- max_health = 10, --- resistances = {{type = "fire", percent = 100}}, --- collision_mask = {"ground-tile"}, --- collision_box = {{-0.0, -0.0}, {0.0, 0.0}}, --- selection_box = {{0, 0}, {0, 0}}, --- maximum_wire_distance = 1, --- supply_area_distance = 3, --- pictures = { --- filename = ICONPATH .. "empty.png", --- filename = "__base__/graphics/icons/small-electric-pole.png", --- filename = BioInd.is_debug and --- "__base__/graphics/icons/small-electric-pole.png" or --- ICONPATH .. "empty.png", --- priority = "low", --- width = 1, --- height = 1, --- frame_count = 1, --- axially_symmetrical = false, --- direction_count = 4, --- shift = {0.75, 0}, --- }, --- connection_points = { --- { --- shadow = { --- --- }, --- wire = { --- copper_wire = {-0, -0}, --- } --- }, --- { --- shadow = { --- --- }, --- wire = { --- copper_wire = {-0, -0}, --- } --- }, --- { --- shadow = { --- --- }, --- wire = { --- copper_wire = {-0, -0}, --- } --- }, --- { --- shadow = { --- --- }, --- wire = { --- copper_wire = {-0, -0}, --- } --- } --- }, --- --- radius_visualisation_picture = { --- filename = ICONPATH .. "empty.png", --- width = 1, --- height = 1, --- priority = "low" --- }, --- }, ---~ hidden_pole.name = "bi-musk-mat-hidden-pole" ---~ hidden_pole.icon = ICONPATH .. "solar-mat.png" ---~ hidden_pole.icon_size = 64 ---~ hidden_pole.icons = { - --~ { - --~ icon = ICONPATH .. "solar-mat.png", - --~ icon_size = 64, - --~ } ---~ } ---~ hidden_pole.flags = {"not-blueprintable", "not-deconstructable", "placeable-off-grid", "not-on-map", "not-repairable"} ---~ hidden_pole.selectable_in_game = false ---~ hidden_pole.draw_copper_wires = BioInd.is_debug ---~ hidden_pole.max_health = 10 ---~ hidden_pole.resistances = {{type = "fire", percent = 100}} ---~ hidden_pole.collision_mask = {"ground-tile"} ---~ hidden_pole.collision_box = {{-0.0, -0.0}, {0.0, 0.0}} ---~ hidden_pole.selection_box = {{0, 0}, {0, 0}} ---~ hidden_pole.maximum_wire_distance = 1 ---~ hidden_pole.supply_area_distance = 3 ---~ hidden_pole.pictures = BioInd.is_debug and hidden_pole.pictures or { - --~ filename = ICONPATH .. "empty.png", - --~ priority = "low", - --~ width = 1, - --~ height = 1, - --~ frame_count = 1, - --~ axially_symmetrical = false, - --~ direction_count = 1, - --~ shift = {0.75, 0}, ---~ } ---~ hidden_pole.connection_points = BioInd.is_debug and hidden_pole.connection_points or { - --~ { - --~ shadow = {}, - --~ wire = { copper_wire = {-0, -0} } - --~ }, ---~ } ---~ hidden_pole.radius_visualisation_picture = { - --~ filename = ICONPATH .. "empty.png", - --~ width = 1, - --~ height = 1, - --~ priority = "low" ---~ } ---~ data:extend({hidden_pole}) - data:extend({ - --~ ------- Hidden Solar Panel for Solar Mat - --~ { - --~ type = "solar-panel", - --~ name = "bi-musk-mat-hidden-panel", - --~ icon = ICONPATH .. "solar-mat.png", - --~ icon_size = 64, - --~ icons = { - --~ { - --~ icon = ICONPATH .. "solar-mat.png", - --~ icon_size = 64, - --~ } - --~ }, - --~ flags = {"not-blueprintable", "not-deconstructable", "placeable-off-grid", "not-on-map", "not-repairable"}, - --~ selectable_in_game = false, - --~ max_health = 1, - --~ resistances = {{type = "fire", percent = 100}}, - --~ collision_mask = {"ground-tile"}, - --~ collision_box = {{-0.0, -0.0}, {0.0, 0.0}}, - --~ selection_box = {{0, 0}, {0, 0}}, - --~ energy_source = { - --~ type = "electric", - --~ usage_priority = "solar" - --~ }, - --~ picture = { - --~ -- filename = ICONPATH .. "empty.png", - --~ filename = "__base__/graphics/icons/solar-panel.png", - --~ priority = "low", - --~ width = 1, - --~ height = 1, - --~ }, - --~ production = "10kW" - --~ }, - - - --~ ------- Solar Panel for Solar Plant / Boiler - --~ { - --~ type = "solar-panel", - --~ name = "bi-solar-boiler-hidden-panel", - --~ localised_name = {"entity-name.bi-solar-boiler"}, - --~ localised_description = {"entity-description.bi-solar-boiler"}, - --~ icon = ICONPATH .. "Bio_Solar_Boiler_Panel_Icon.png", - --~ icon_size = 64, - --~ icons = { - --~ { - --~ icon = ICONPATH .. "Bio_Solar_Boiler_Panel_Icon.png", - --~ icon_size = 64, - --~ } - --~ }, - --~ flags = {"not-blueprintable", "not-deconstructable", "placeable-off-grid", "not-on-map", "not-repairable"}, - --~ max_health = 400, - --~ render_no_power_icon = true, - --~ resistances = {{type = "fire", percent = 100}}, - --~ -- collision_box = {{-4.2, -4.2}, {4.2, 4.2}}, - --~ -- selection_box = {{-1.2, -1.2}, {1.2, 1.2}}, - --~ collision_box = {{0, 0}, {0, 0}}, - --~ selection_box = {{0, 0}, {0, 0}}, ---~ collision_mask = {}, - --~ energy_source = { - --~ type = "electric", - --~ usage_priority = "solar" - --~ }, - --~ -- picture = { - --~ -- filename = ENTITYPATH .. "Bio_Solar_Boiler.png", - --~ -- priority = "low", - --~ -- width = 288, - --~ -- height = 288, - --~ -- hr_version = { - --~ -- filename = ENTITYPATH .. "Bio_Solar_Boiler.png", - --~ -- priority = "low", - --~ -- width = 288, - --~ -- height = 288, - --~ -- } - --~ -- }, - --~ picture = { - --~ filename = ICONPATH .. "empty.png", - --~ priority = "low", - --~ size = 1, - --~ }, - - --~ overlay = { - --~ layers = { - --~ { - --~ filename = ENTITYPATH .. "Bio_Solar_Boiler.png", - --~ priority = "high", - --~ width = 288, - --~ height = 288, - --~ hr_version = { - --~ filename = ENTITYPATH .. "Bio_Solar_Boiler.png", - --~ priority = "high", - --~ width = 288, - --~ height = 288, - --~ } - --~ }, - --~ } - --~ }, - --~ production = "1.8MW" - --~ }, - - ------- Boiler for Solar Plant / Boiler { type = "boiler", @@ -608,64 +379,40 @@ data:extend({ north = { layers = { { - filename = ENTITYPATH .. "Bio_Solar_Boiler.png", - priority = "high", - width = 288, - height = 288, - hr_version = { filename = ENTITYPATH .. "Bio_Solar_Boiler.png", priority = "high", width = 288, height = 288, - } }, } }, east = { layers = { { - filename = ENTITYPATH .. "Bio_Solar_Boiler.png", - priority = "high", - width = 288, - height = 288, - hr_version = { filename = ENTITYPATH .. "Bio_Solar_Boiler.png", priority = "high", width = 288, height = 288, - } }, }, }, south = { layers = { { - filename = ENTITYPATH .. "Bio_Solar_Boiler.png", - priority = "high", - width = 288, - height = 288, - hr_version = { filename = ENTITYPATH .. "Bio_Solar_Boiler.png", priority = "high", width = 288, height = 288, - } }, } }, west = { layers = { { - filename = ENTITYPATH .. "Bio_Solar_Boiler.png", - priority = "high", - width = 288, - height = 288, - hr_version = { filename = ENTITYPATH .. "Bio_Solar_Boiler.png", priority = "high", width = 288, height = 288, - } }, } } @@ -675,15 +422,6 @@ data:extend({ fire_glow_flicker_enabled = false, fire_glow = { north = { - filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", - priority = "extra-high", - frame_count = 1, - width = 62, - height = 62, - shift = {0.09, -2.8}, - scale = 1.5, - blend_mode = "additive", - hr_version = { filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", priority = "extra-high", frame_count = 1, @@ -692,17 +430,8 @@ data:extend({ shift = {0.09, -2.8}, scale = 1.5, blend_mode = "additive", - } }, east = { - filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", - priority = "extra-high", - frame_count = 1, - width = 62, - height = 62, - shift = {0, -3}, - blend_mode = "additive", - hr_version = { filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", priority = "extra-high", frame_count = 1, @@ -710,17 +439,8 @@ data:extend({ height = 62, shift = {0, -3}, blend_mode = "additive", - } }, south = { - filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", - priority = "extra-high", - frame_count = 1, - width = 62, - height = 62, - shift = {0, -3}, - blend_mode = "additive", - hr_version = { filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", priority = "extra-high", frame_count = 1, @@ -728,17 +448,8 @@ data:extend({ height = 62, shift = {0, -3}, blend_mode = "additive", - } }, west = { - filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", - priority = "extra-high", - frame_count = 1, - width = 62, - height = 62, - shift = {0, -3}, - blend_mode = "additive", - hr_version = { filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", priority = "extra-high", frame_count = 1, @@ -746,7 +457,6 @@ data:extend({ height = 62, shift = {0, -3}, blend_mode = "additive", - } }, }, burning_cooldown = 20 diff --git a/Bio_Industries_2/prototypes/Wood_Products/entities.lua b/Bio_Industries_2/prototypes/Wood_Products/entities.lua index b73395a..fd24b8f 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/entities.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/entities.lua @@ -37,239 +37,132 @@ end pipepictures_w = function() return { straight_vertical_single = { - filename = PIPEPATH .. "pipe-straight-vertical-single.png", - priority = "extra-high", - width = 80, - height = 80, - hr_version = { filename = PIPEPATH .. "hr-pipe-straight-vertical-single.png", priority = "extra-high", width = 160, height = 160, scale = 0.5 - } }, straight_vertical = { - filename = PIPEPATH .. "pipe-straight-vertical.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-straight-vertical.png", priority = "extra-high", size = 128, scale = 0.5 - } }, straight_vertical_window = { - filename = PIPEPATH .. "pipe-straight-vertical-window.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-straight-vertical-window.png", priority = "extra-high", size = 128, scale = 0.5 - } }, straight_horizontal_window = { - filename = PIPEPATH .. "pipe-straight-horizontal-window.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-straight-horizontal-window.png", priority = "extra-high", size = 128, scale = 0.5 - } }, straight_horizontal = { - filename = PIPEPATH .. "pipe-straight-horizontal.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-straight-horizontal.png", priority = "extra-high", size = 128, scale = 0.5 - } }, corner_up_right = { - filename = PIPEPATH .. "pipe-corner-up-right.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-corner-up-right.png", priority = "extra-high", size = 128, scale = 0.5 - } }, corner_up_left = { - filename = PIPEPATH .. "pipe-corner-up-left.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-corner-up-left.png", priority = "extra-high", size = 128, scale = 0.5 - } }, corner_down_right = { - filename = PIPEPATH .. "pipe-corner-down-right.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-corner-down-right.png", priority = "extra-high", size = 128, scale = 0.5 - } }, corner_down_left = { - filename = PIPEPATH .. "pipe-corner-down-left.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-corner-down-left.png", priority = "extra-high", size = 128, scale = 0.5 - } }, t_up = { - filename = PIPEPATH .. "pipe-t-up.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-t-up.png", priority = "extra-high", size = 128, scale = 0.5 - } }, t_down = { - filename = PIPEPATH .. "pipe-t-down.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-t-down.png", priority = "extra-high", size = 128, scale = 0.5 - } }, t_right = { - filename = PIPEPATH .. "pipe-t-right.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-t-right.png", priority = "extra-high", size = 128, scale = 0.5 - } }, t_left = { - filename = PIPEPATH .. "pipe-t-left.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-t-left.png", priority = "extra-high", size = 128, scale = 0.5 - } }, cross = { - filename = PIPEPATH .. "pipe-cross.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-cross.png", priority = "extra-high", size = 128, scale = 0.5 - } }, ending_up = { - filename = PIPEPATH .. "pipe-ending-up.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-ending-up.png", priority = "extra-high", size = 128, scale = 0.5 - } }, ending_down = { - filename = PIPEPATH .. "pipe-ending-down.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-ending-down.png", priority = "extra-high", size = 128, scale = 0.5 - } }, ending_right = { - filename = PIPEPATH .. "pipe-ending-right.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-ending-right.png", priority = "extra-high", size = 128, scale = 0.5 - } }, ending_left = { - filename = PIPEPATH .. "pipe-ending-left.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-ending-left.png", priority = "extra-high", size = 128, scale = 0.5 - } }, horizontal_window_background = { - filename = PIPEPATH .. "pipe-horizontal-window-background.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-horizontal-window-background.png", priority = "extra-high", size = 128, scale = 0.5 - } }, vertical_window_background = { - filename = PIPEPATH .. "pipe-vertical-window-background.png", - priority = "extra-high", - size = 64, - hr_version = { filename = PIPEPATH .. "hr-pipe-vertical-window-background.png", priority = "extra-high", size = 128, scale = 0.5 - } }, fluid_background = { - filename = PIPEPATH .. "fluid-background.png", - priority = "extra-high", - width = 32, - height = 20, - hr_version = { filename = PIPEPATH .. "hr-fluid-background.png", priority = "extra-high", width = 64, height = 40, scale = 0.5 - } }, low_temperature_flow = { filename = PIPEPATH .. "fluid-flow-low-temperature.png", @@ -290,15 +183,6 @@ pipepictures_w = function() height = 18 }, gas_flow = { - filename = PIPEPATH .. "steam.png", - priority = "extra-high", - line_length = 10, - width = 24, - height = 15, - frame_count = 60, - axially_symmetrical = false, - direction_count = 1, - hr_version = { filename = PIPEPATH .. "hr-steam.png", priority = "extra-high", line_length = 10, @@ -307,7 +191,6 @@ pipepictures_w = function() frame_count = 60, axially_symmetrical = false, direction_count = 1 - } } } end @@ -1244,169 +1127,33 @@ data:extend({ vehicle_impact_sound = sounds.generic_impact, pictures = { up = { - filename = ENTITYPATH .. "/pipe-to-ground/pipe-to-ground-up.png", - priority = "high", - size = 64, --, shift = {0.10, -0.04} - hr_version = { filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-up.png", priority = "extra-high", size = 128, scale = 0.5 - } }, down = { - filename = ENTITYPATH .. "/pipe-to-ground/pipe-to-ground-down.png", - priority = "high", - size = 64, --, shift = {0.05, 0} - hr_version = { filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-down.png", priority = "extra-high", size = 128, scale = 0.5 - } }, left = { - filename = ENTITYPATH .. "/pipe-to-ground/pipe-to-ground-left.png", - priority = "high", - size = 64, --, shift = {-0.12, 0.1} - hr_version = { filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-left.png", priority = "extra-high", size = 128, scale = 0.5 - } }, right = { - filename = ENTITYPATH .. "/pipe-to-ground/pipe-to-ground-right.png", - priority = "high", - size = 64, --, shift = {0.1, 0.1} - hr_version = { filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-right.png", priority = "extra-high", size = 128, scale = 0.5 - } }, }, }, }) ---~ ------- Large Wooden Chest ---~ data:extend({ - --~ { - --~ type = "container", - --~ name = "bi-wooden-chest-large", - --~ icon = ICONPATH .. "large_wooden_chest_icon.png", - --~ icon_size = 64, - --~ icons = { - --~ { - --~ icon = ICONPATH .. "large_wooden_chest_icon.png", - --~ icon_size = 64, - --~ } - --~ }, - --~ flags = {"placeable-neutral", "player-creation"}, - --~ minable = {mining_time = 1, result = "bi-wooden-chest-large"}, - --~ max_health = 200, - --~ corpse = "small-remnants", - --~ collision_box = {{-0.7, -0.7}, {0.7, 0.7}}, - --~ selection_box = {{-1.0, -1.0}, {1.0, 1.0}}, - --~ fast_replaceable_group = "container", - --~ inventory_size = 128, -- 64 - --~ open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" }, - --~ close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" }, - --~ vehicle_impact_sound = sounds.car_wood_impact, - --~ picture = { - --~ filename = WOODPATH .. "large_wooden_chest.png", - --~ priority = "extra-high", - --~ width = 184, - --~ height = 132, - --~ shift = {0.5, 0}, - --~ scale = 0.5, - --~ }, - --~ circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - --~ circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, - --~ circuit_wire_max_distance = default_circuit_wire_max_distance - --~ }, ---~ }) - ---~ ------- Huge Wooden Chest ---~ data:extend({ - --~ { - --~ type = "container", - --~ name = "bi-wooden-chest-huge", - --~ icon = ICONPATH .. "huge_wooden_chest_icon.png", - --~ icon_size = 64, - --~ icons = { - --~ { - --~ icon = ICONPATH .. "huge_wooden_chest_icon.png", - --~ icon_size = 64, - --~ } - --~ }, - --~ scale_info_icons = true, - --~ flags = {"placeable-neutral", "player-creation"}, - --~ minable = {mining_time = 1.5, result = "bi-wooden-chest-huge"}, - --~ max_health = 350, - --~ corpse = "small-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 = 432, --144 - --~ open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" }, - --~ close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" }, - --~ vehicle_impact_sound = sounds.car_wood_impact, - --~ picture = { - --~ filename = WOODPATH .. "huge_wooden_chest.png", - --~ priority = "extra-high", - --~ width = 184, - --~ height = 132, - --~ shift = {0.5, 0}, - --~ scale = 0.75, - --~ }, - --~ circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - --~ circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, - --~ circuit_wire_max_distance = default_circuit_wire_max_distance - --~ }, ---~ }) - ---~ ------- Giga Wooden Chest ---~ data:extend({ - --~ { - --~ type = "container", - --~ name = "bi-wooden-chest-giga", - --~ icon = ICONPATH .. "giga_wooden_chest_icon.png", - --~ icon_size = 64, - --~ icons = { - --~ { - --~ icon = ICONPATH .. "giga_wooden_chest_icon.png", - --~ icon_size = 64, - --~ } - --~ }, - --~ scale_info_icons = true, - --~ flags = {"placeable-neutral", "player-creation"}, - --~ minable = {mining_time = 3.5, result = "bi-wooden-chest-giga"}, - --~ max_health = 350, - --~ corpse = "big-remnants", - --~ collision_box = {{-2.8, -2.8}, {2.8, 2.8}}, - --~ selection_box = {{-3, -3}, {3, 3}}, - --~ fast_replaceable_group = "container", - --~ inventory_size = 1728, --576 - --~ open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" }, - --~ close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" }, - --~ vehicle_impact_sound = sounds.car_wood_impact, - --~ picture = { - --~ filename = WOODPATH .. "giga_wooden_chest.png", - --~ priority = "extra-high", - --~ width = 501, - --~ height = 366, - --~ shift = {0.88, -0.170}, - --~ scale = 0.5, - --~ }, - --~ circuit_wire_connection_point = circuit_connector_definitions["chest"].points, - --~ circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, - --~ circuit_wire_max_distance = default_circuit_wire_max_distance - --~ }, ---~ }) - ------ Power to Rail Pole -- Changed to medium-electric pole so the built entity resembles the icon (0.18.1) --~ local my_pole = util.table.deepcopy(data.raw["electric-pole"]["small-electric-pole"]) diff --git a/Bio_Industries_2/prototypes/Wood_Products/pipes.lua b/Bio_Industries_2/prototypes/Wood_Products/pipes.lua index ce4358f..b2b77a8 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/pipes.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/pipes.lua @@ -143,15 +143,9 @@ function change_graphics (was_picture, sheet_element, quality) if not sheet_element.shift then sheet_element.shift = {x = 0, y = 0} end - if (quality == "hq") and (was_picture.hr_version) then - --BioInd.writeDebug("hq") - picture = was_picture.hr_version - k = 2 - else --BioInd.writeDebug("lq") picture = was_picture k = 1 - end --BioInd.writeDebug("%s Quality: %s", {sheet_element.number, quality}) if not (picture) then diff --git a/Bio_Industries_2/prototypes/Wood_Products/tint_rails_remnants_function.lua b/Bio_Industries_2/prototypes/Wood_Products/tint_rails_remnants_function.lua index a87c438..1d05a79 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/tint_rails_remnants_function.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/tint_rails_remnants_function.lua @@ -51,11 +51,9 @@ function set_tint_to_rails (rails_entities, tint) for i, handler in pairs (global.rails) do --handler.name = "straight_rail_horizontal" local was_filename = handler.table.filename - handler.table.filename = sheet_path_ties .. handler.name .. "-ties.png" - handler.table.hr_version.filename = sheet_path_ties .. "hr-" .. handler.name .. "-ties.png" + handler.table.filename = sheet_path_ties .. "hr-" .. handler.name .. "-ties.png" BioInd.writeDebug('Replaced: %s ===>>> %s', {was_filename, handler.table.filename}) handler.table.tint = tint - handler.table.hr_version.tint = tint -- oops, i've forgot it, added in 0.0.3 end --BioInd.writeDebug("End rails") --------------------- end @@ -82,11 +80,9 @@ end for i, handler in pairs (global.remnants) do --remnants.name = "straight_rail_horizontal" local was_filename = handler.table.filename - handler.table.filename = sheet_path_ties .. handler.name .. "-ties-remnants.png" - handler.table.hr_version.filename = sheet_path_ties .. "hr-" .. handler.name .. "-ties-remnants.png" + handler.table.filename = sheet_path_ties .. "hr-" .. handler.name .. "-ties-remnants.png" BioInd.writeDebug('Replaced: %s ===>>> %s', {was_filename, handler.table.filename}) handler.table.tint = tint - handler.table.hr_version.tint = tint -- oops, i'mm forgot it, added in 0.0.3 end --BioInd.writeDebug("End remnants") --------------------- end diff --git a/Bio_Industries_2/prototypes/Wood_Products/update_bridge_rails_remnants.lua b/Bio_Industries_2/prototypes/Wood_Products/update_bridge_rails_remnants.lua deleted file mode 100644 index afbddc2..0000000 --- a/Bio_Industries_2/prototypes/Wood_Products/update_bridge_rails_remnants.lua +++ /dev/null @@ -1,77 +0,0 @@ ---~ local BioInd = require('common')('Bio_Industries') - ---~ local ICONPATH = BioInd.modRoot .. "/graphics/entities/wood_products/rails/remnants/" ---~ local PIX - ---~ local rails_c_remnants = data.raw["rail-remnants"]["straight-rail-remnants-wood-bridge"] ---~ rails_c_remnants.localised_name = {"entity-name.rail-remnants-wood-bridge"} ---~ rails_c_remnants.localised_description = {"entity-description.rail-remnants-wood-bridge"} - ---~ PIX = rails_c_remnants.pictures - ---~ PIX.straight_rail_horizontal.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_horizontal.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.straight_rail_vertical.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_vertical.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.straight_rail_diagonal_left_top.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_diagonal_left_top.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.straight_rail_diagonal_right_top.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_diagonal_right_top.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.straight_rail_diagonal_right_bottom.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_diagonal_right_bottom.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.straight_rail_diagonal_left_bottom.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_diagonal_left_bottom.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" - ---~ PIX.straight_rail_horizontal.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_horizontal.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.straight_rail_vertical.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_vertical.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.straight_rail_diagonal_left_top.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_diagonal_left_top.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.straight_rail_diagonal_right_top.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_diagonal_right_top.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.straight_rail_diagonal_right_bottom.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_diagonal_right_bottom.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.straight_rail_diagonal_left_bottom.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.straight_rail_diagonal_left_bottom.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" - - - ---~ local rails_curved_c_remnants = data.raw["rail-remnants"]["curved-rail-remnants-wood-bridge"] ---~ rails_curved_c_remnants.localised_name = {"entity-name.rail-remnants-wood-bridge"} ---~ rails_curved_c_remnants.localised_description = {"entity-description.rail-remnants-wood-bridge"} ---~ PIX = rails_curved_c_remnants.pictures - ---~ PIX.curved_rail_vertical_left_top.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_vertical_left_top.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_vertical_left_bottom.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_vertical_left_bottom.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_vertical_right_top.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_vertical_right_top.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_vertical_right_bottom.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_vertical_right_bottom.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_horizontal_left_top.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_horizontal_left_top.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_horizontal_right_top.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_horizontal_right_top.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_horizontal_right_bottom.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_horizontal_right_bottom.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_horizontal_left_bottom.stone_path_background.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_horizontal_left_bottom.stone_path_background.hr_version.filename = ICONPATH .. "hr-remnants.png" - ---~ PIX.curved_rail_vertical_left_top.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_vertical_left_top.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_vertical_left_bottom.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_vertical_left_bottom.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_vertical_right_top.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_vertical_right_top.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_vertical_right_bottom.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_vertical_right_bottom.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_horizontal_left_top.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_horizontal_left_top.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_horizontal_right_top.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_horizontal_right_top.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_horizontal_right_bottom.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_horizontal_right_bottom.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" ---~ PIX.curved_rail_horizontal_left_bottom.stone_path.filename = ICONPATH .. "remnants.png" ---~ PIX.curved_rail_horizontal_left_bottom.stone_path.hr_version.filename = ICONPATH .. "hr-remnants.png" diff --git a/Bio_Industries_2/prototypes/Wood_Products/wooden_rail_bridge_update.lua b/Bio_Industries_2/prototypes/Wood_Products/wooden_rail_bridge_update.lua index 6d936db..7681dde 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/wooden_rail_bridge_update.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/wooden_rail_bridge_update.lua @@ -2,32 +2,6 @@ local BioInd = require('common')('Bio_Industries') local ICONPATH = BioInd.modRoot .. "/graphics/entities/wood_products/rails/" ---~ local type = { - --~ straight_rail_horizontal = { prefix = "straight-rail", dir = "horizontal" }, - --~ straight_rail_vertical = { prefix = "straight-rail", dir = "vertical" }, - --~ straight_rail_diagonal_left_top = { prefix = "straight-rail", dir = "diagonal-left-top" }, - --~ straight_rail_diagonal_right_top = { prefix = "straight-rail", dir = "diagonal-right-top" }, - --~ straight_rail_diagonal_left_bottom = { prefix = "straight-rail", dir = "diagonal-left-bottom" }, - --~ straight_rail_diagonal_right_bottom = { prefix = "straight-rail", dir = "diagonal-right-bottom" }, - - --~ curved_rail_horizontal_left_bottom = { prefix = "curved-rail", dir = "horizontal-left-bottom" }, - --~ curved_rail_horizontal_right_bottom = { prefix = "curved-rail", dir = "horizontal-right-bottom" }, - --~ curved_rail_horizontal_left_top = { prefix = "curved-rail", dir = "horizontal-left-top" }, - --~ curved_rail_horizontal_right_top = { prefix = "curved-rail", dir = "horizontal-right-top" }, - --~ curved_rail_vertical_left_bottom = { prefix = "curved-rail", dir = "vertical-left-bottom" }, - --~ curved_rail_vertical_right_bottom = { prefix = "curved-rail", dir = "vertical-right-bottom" }, - --~ curved_rail_vertical_left_top = { prefix = "curved-rail", dir = "vertical-left-top" }, - --~ curved_rail_vertical_right_top = { prefix = "curved-rail", dir = "vertical-right-top" } ---~ } - ---~ for class, info in pairs(type) do - --~ local proto = data.raw[info.prefix] - --~ data.raw[info.prefix]["bi-" .. info.prefix .. "-wood-bridge"].pictures[class].stone_path.hr_version.filename = ICONPATH .. info.prefix .. "-bridge/hr-" .. info.prefix .. "-" .. info.dir .. "-stone-path.png" - --~ data.raw[info.prefix]["bi-" .. info.prefix .. "-wood-bridge"].pictures[class].stone_path_background.hr_version.filename = ICONPATH .. info.prefix .. "-bridge/hr-" .. info.prefix .. "-" .. info.dir .. "-stone-path-background.png" - --~ data.raw[info.prefix]["bi-" .. info.prefix .. "-wood-bridge"].pictures[class].stone_path.filename = ICONPATH ..info.prefix .. "-bridge/" .. info.prefix .. "-" .. info.dir .. "-stone-path.png" - --~ data.raw[info.prefix]["bi-" .. info.prefix .. "-wood-bridge"].pictures[class].stone_path_background.filename = ICONPATH .. info.prefix .. "-bridge/" .. info.prefix .. "-" .. info.dir .. "-stone-path-background.png" ---~ end - local pix = { "straight_rail_horizontal", "straight_rail_vertical", @@ -57,19 +31,15 @@ BioInd.show("direction", direction) img = data.raw[rail_type]["bi-" .. rail_type .. "-wood-bridge"].pictures[pic] img.stone_path.filename = FILE .. "stone-path.png" - img.stone_path.hr_version.filename = HR_FILE .. "stone-path.png" img.stone_path_background.filename = FILE.."stone-path-background.png" - img.stone_path_background.hr_version.filename = HR_FILE.."stone-path-background.png" -- Remnants img = data.raw["rail-remnants"][rail_type .. "-remnants-wood-bridge"].pictures[pic] img.stone_path.filename = ICONPATH .. "remnants/remnants.png" - img.stone_path.hr_version.filename = ICONPATH .. "remnants/hr-remnants.png" img.stone_path_background.filename = ICONPATH .. "remnants/remnants.png" - img.stone_path_background.hr_version.filename = ICONPATH .. "remnants/hr-remnants.png" end -- Localize remnants! diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_entities.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_entities.lua index e3f5c2c..026a6aa 100644 --- a/Bio_Industries_2/prototypes/compound_entities/hidden_entities.lua +++ b/Bio_Industries_2/prototypes/compound_entities/hidden_entities.lua @@ -200,7 +200,6 @@ BI.add_layer = function(layers, data) BioInd.check_args(data, "table", "layer data") layers = layers or {} - local name = data.name local hr_name = data.hr_name local priority = data.priority local height = data.height @@ -211,13 +210,6 @@ BI.add_layer = function(layers, data) --~ size = size or --~ (height and width and height == width) and height layers[#layers + 1] = { - filename = name, - priority = priority or "low", - width = width, - height = height, - size = size, - draw_as_shadow = shadow, - hr_version = hr_name and { filename = hr_name, priority = priority or "low", width = width and width * 2, @@ -225,7 +217,6 @@ BI.add_layer = function(layers, data) size = size and size * 2, draw_as_shadow = shadow, scale = 0.5, - } } return layers end diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua index c9e5cc6..4369356 100644 --- a/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua +++ b/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua @@ -112,16 +112,6 @@ BioInd.show("radar.name", c_entities["bi-arboretum"].hidden[h_key].name) radar.pictures = { layers = { { - filename = "__base__/graphics/entity/radar/radar.png", - priority = "extra-high", - width = 98, - height = 128, - apply_projection = false, - direction_count = 64, - line_length = 8, - shift = util.by_pixel(1, -16), - scale = 0.5, - hr_version = { filename = "__base__/graphics/entity/radar/hr-radar.png", priority = "extra-high", width = 196, @@ -131,7 +121,6 @@ BioInd.show("radar.name", c_entities["bi-arboretum"].hidden[h_key].name) line_length = 8, shift = util.by_pixel(1, -16), scale = 0.25 - } } } }