Remove hr_version

This commit is contained in:
Simon Brodtmann 2025-07-05 15:38:53 +02:00
parent e1ef59e86b
commit e66cb49c77
14 changed files with 23 additions and 1373 deletions

View file

@ -12,17 +12,6 @@ if BI.Settings.Bio_Cannon then
return { return {
layers = { 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", priority = "high",
width = 692, width = 692,
height = 672, height = 672,
@ -35,7 +24,6 @@ if BI.Settings.Bio_Cannon then
filename = ENTITYPATH .. "hr_bio_cannon_anim.png", filename = ENTITYPATH .. "hr_bio_cannon_anim.png",
scale = 0.5 scale = 0.5
} }
}
} }
@ -46,16 +34,6 @@ if BI.Settings.Bio_Cannon then
return { return {
layers = { 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", priority = "high",
width = 692, width = 692,
height = 672, height = 672,
@ -66,19 +44,7 @@ if BI.Settings.Bio_Cannon then
shift = {0, -0.8}, shift = {0, -0.8},
filename = ENTITYPATH .. "hr_bio_cannon_open.png", filename = ENTITYPATH .. "hr_bio_cannon_open.png",
scale = 0.5 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", priority = "high",
width = 320, width = 320,
height = 672, height = 672,
@ -93,7 +59,6 @@ if BI.Settings.Bio_Cannon then
} }
} }
} }
}
end end
function folding_animation() function folding_animation()
@ -101,17 +66,6 @@ if BI.Settings.Bio_Cannon then
layers = { 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", priority = "high",
width = 692, width = 692,
height = 672, height = 672,
@ -124,7 +78,6 @@ if BI.Settings.Bio_Cannon then
filename = ENTITYPATH .. "hr_bio_cannon_anim.png", filename = ENTITYPATH .. "hr_bio_cannon_anim.png",
scale = 0.5 scale = 0.5
} }
}
} }
} }
@ -134,17 +87,6 @@ if BI.Settings.Bio_Cannon then
return { return {
layers = { 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", priority = "high",
width = 692, width = 692,
height = 672, height = 672,
@ -155,21 +97,7 @@ if BI.Settings.Bio_Cannon then
shift = {0, -0.8}, shift = {0, -0.8},
filename = ENTITYPATH .. "hr_bio_cannon_anim.png", filename = ENTITYPATH .. "hr_bio_cannon_anim.png",
scale = 0.5 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", priority = "high",
width = 692, width = 692,
height = 672, height = 672,
@ -182,8 +110,6 @@ if BI.Settings.Bio_Cannon then
draw_as_shadow = true, draw_as_shadow = true,
scale = 0.5 scale = 0.5
} }
}
} }
} }
end end
@ -266,17 +192,6 @@ if BI.Settings.Bio_Cannon then
layers = { 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, width = 692,
height = 672, height = 672,
direction_count = 1, direction_count = 1,
@ -287,7 +202,6 @@ if BI.Settings.Bio_Cannon then
filename = REMNANTSPATH .. "hr_bio_cannon_remnant.png", filename = REMNANTSPATH .. "hr_bio_cannon_remnant.png",
scale = 0.5 scale = 0.5
} }
}
} }
}) })

View file

@ -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 ---- Arboretum Area Overlay
{ {
type = "ammo-turret", type = "ammo-turret",

View file

@ -7,57 +7,30 @@ function assembler2pipepicturesCokery()
return return
{ {
north = { 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", filename = ICONPATH .. "empty.png",
priority = "extra-high", priority = "extra-high",
width = 1, width = 1,
height = 1, height = 1,
shift = util.by_pixel(2.25, 13.5), shift = util.by_pixel(2.25, 13.5),
scale = 0.5, scale = 0.5,
}
}, },
east = { 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", filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-E.png",
priority = "extra-high", priority = "extra-high",
width = 42, width = 42,
height = 76, height = 76,
shift = util.by_pixel(-24.5, 1), shift = util.by_pixel(-24.5, 1),
scale = 0.5, scale = 0.5,
}
}, },
south = { 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", filename = ICONPATH .. "empty.png",
priority = "extra-high", priority = "extra-high",
width = 1, width = 1,
height = 1, height = 1,
shift = util.by_pixel(0, -31.25), shift = util.by_pixel(0, -31.25),
scale = 0.5, scale = 0.5,
}
}, },
west = { 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", filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-W.png",
priority = "extra-high", priority = "extra-high",
width = 39, width = 39,
@ -66,7 +39,6 @@ function assembler2pipepicturesCokery()
scale = 0.5, scale = 0.5,
} }
} }
}
end end
@ -108,50 +80,27 @@ end
function pipecoverspicturesCokery() function pipecoverspicturesCokery()
return { return {
north = { north = {
filename = ICONPATH .. "empty.png",
priority = "extra-high",
width = 1,
height = 1,
hr_version = {
filename = ICONPATH .. "empty.png", filename = ICONPATH .. "empty.png",
priority = "extra-high", priority = "extra-high",
width = 1, width = 1,
height = 1, height = 1,
scale = 0.5 scale = 0.5
}
}, },
east = { 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
scale = 0.5 scale = 0.5
}
}, },
south = { south = {
filename = ICONPATH .. "empty.png",
priority = "extra-high",
width = 1,
height = 1,
hr_version = {
filename = ICONPATH .. "empty.png", filename = ICONPATH .. "empty.png",
priority = "extra-high", priority = "extra-high",
width = 1, width = 1,
height = 1, height = 1,
scale = 0.5 scale = 0.5
}
}, },
west = { 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
@ -159,7 +108,6 @@ function pipecoverspicturesCokery()
scale = 0.5 scale = 0.5
} }
} }
}
end end
@ -167,57 +115,30 @@ function assembler2pipepicturesBioreactor()
return return
{ {
north = { 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", filename = ICONPATH .. "empty.png",
priority = "extra-high", priority = "extra-high",
width = 71, width = 71,
height = 38, height = 38,
shift = util.by_pixel(2.25, 13.5), shift = util.by_pixel(2.25, 13.5),
scale = 0.5, scale = 0.5,
}
}, },
east = { 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", filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-E.png",
priority = "extra-high", priority = "extra-high",
width = 42, width = 42,
height = 76, height = 76,
shift = util.by_pixel(-24.5, 1), shift = util.by_pixel(-24.5, 1),
scale = 0.5, scale = 0.5,
}
}, },
south = { 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", filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-S.png",
priority = "extra-high", priority = "extra-high",
width = 88, width = 88,
height = 61, height = 61,
shift = util.by_pixel(0, -31.25), shift = util.by_pixel(0, -31.25),
scale = 0.5, scale = 0.5,
}
}, },
west = { 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", filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-W.png",
priority = "extra-high", priority = "extra-high",
width = 39, width = 39,
@ -226,7 +147,6 @@ function assembler2pipepicturesBioreactor()
scale = 0.5, scale = 0.5,
} }
} }
}
end end
@ -234,50 +154,27 @@ end
function pipecoverspicturesBioreactor() function pipecoverspicturesBioreactor()
return { return {
north = { north = {
filename = ICONPATH .. "empty.png",
priority = "extra-high",
width = 1,
height = 1,
hr_version = {
filename = ICONPATH .. "empty.png", filename = ICONPATH .. "empty.png",
priority = "extra-high", priority = "extra-high",
width = 1, width = 1,
height = 1, height = 1,
scale = 0.5 scale = 0.5
}
}, },
east = { 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
scale = 0.5 scale = 0.5
}
}, },
south = { 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
scale = 0.5 scale = 0.5
}
}, },
west = { 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
@ -285,7 +182,6 @@ function pipecoverspicturesBioreactor()
scale = 0.5 scale = 0.5
} }
} }
}
end end
@ -299,13 +195,6 @@ function BioFarm_Pipe_Connectors_Left()
width = 51, width = 51,
height = 35, height = 35,
shift = {0.25, 1}, 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 = { east = {
filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_l.png", filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_l.png",
@ -313,13 +202,6 @@ function BioFarm_Pipe_Connectors_Left()
width = 18, width = 18,
height = 48, height = 48,
shift = {-1, -0.25}, 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 = { south = {
filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_l.png", filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_l.png",
@ -327,13 +209,6 @@ function BioFarm_Pipe_Connectors_Left()
width = 49, width = 49,
height = 25, height = 25,
shift = {0.5, -1}, 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 = { west = {
filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_l.png", filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_l.png",
@ -341,13 +216,6 @@ function BioFarm_Pipe_Connectors_Left()
width = 16, width = 16,
height = 51, height = 51,
shift = {0.5, 0.5}, 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 end
@ -357,58 +225,32 @@ function bio_farm_pipe_pictures()
return return
{ {
north = { 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", filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-N.png",
priority = "extra-high", priority = "extra-high",
width = 71, width = 71,
height = 38, height = 38,
shift = util.by_pixel(2.25, 13.5), shift = util.by_pixel(2.25, 13.5),
scale = 0.5, scale = 0.5,
}
}, },
east = { east = {
filename = ICONPATH .. "empty.png", filename = ICONPATH .. "empty.png",
priority = "extra-high", priority = "extra-high",
width = 1, width = 1,
height = 1, height = 1,
hr_version = {
filename = ICONPATH .. "empty.png",
priority = "extra-high",
width = 1,
height = 1,
}
}, },
south = { 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", filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-S.png",
priority = "extra-high", priority = "extra-high",
width = 88, width = 88,
height = 61, height = 61,
shift = util.by_pixel(0, -31.25), shift = util.by_pixel(0, -31.25),
scale = 0.5, scale = 0.5,
}
}, },
west = { west = {
filename = ICONPATH .. "empty.png", filename = ICONPATH .. "empty.png",
priority = "extra-high", priority = "extra-high",
width = 1, width = 1,
height = 1, height = 1,
hr_version = {
filename = ICONPATH .. "empty.png",
priority = "extra-high",
width = 1,
height = 1,
}
} }
} }
end end
@ -418,60 +260,33 @@ bio_farm_pipe_covers_pictures = function()
north = { north = {
layers = { 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
scale = 0.5 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north-shadow.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
scale = 0.5, scale = 0.5,
draw_as_shadow = true draw_as_shadow = true
}
}, },
}, },
}, },
east = { east = {
layers = { 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
shift = {-0.22, 0}, shift = {-0.22, 0},
scale = 0.5 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east-shadow.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
@ -479,67 +294,39 @@ bio_farm_pipe_covers_pictures = function()
scale = 0.5, scale = 0.5,
shift = {-0.22, 0}, shift = {-0.22, 0},
draw_as_shadow = true draw_as_shadow = true
}
}, },
}, },
}, },
south = { south = {
layers = { 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
scale = 0.5 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south-shadow.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
scale = 0.5, scale = 0.5,
draw_as_shadow = true draw_as_shadow = true
}
}, },
}, },
}, },
west = { west = {
layers = { 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
shift = {0.2, 0}, shift = {0.2, 0},
scale = 0.5 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", filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west-shadow.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
@ -547,77 +334,8 @@ bio_farm_pipe_covers_pictures = function()
scale = 0.5, scale = 0.5,
shift = {0.2, 0}, shift = {0.2, 0},
draw_as_shadow = true draw_as_shadow = true
}
}, },
}, },
} }
} }
end 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
]]

View file

@ -22,33 +22,27 @@ for i = 1, TREE_LEVELS do
wooden.name = "bio-" .. wooden.name .. "-" .. i wooden.name = "bio-" .. wooden.name .. "-" .. i
for _, pic in pairs(wooden.pictures) do for _, pic in pairs(wooden.pictures) do
pic.scale = (pic.scale or 1)/TREE_LEVELS*i pic.scale = (pic.scale or 1)/TREE_LEVELS*i
pic.hr_version.scale = (pic.hr_version.scale or 1)/TREE_LEVELS*i
end end
for _, pic in pairs(wooden.shadows) do for _, pic in pairs(wooden.shadows) do
pic.scale = (pic.scale or 1)/TREE_LEVELS*i pic.scale = (pic.scale or 1)/TREE_LEVELS*i
pic.hr_version.scale = (pic.hr_version.scale or 1)/TREE_LEVELS*i
end end
branch = table.deepcopy(data.raw["optimized-particle"]["branch-particle"]) branch = table.deepcopy(data.raw["optimized-particle"]["branch-particle"])
branch.name = "bio-" .. branch.name .. "-" .. i branch.name = "bio-" .. branch.name .. "-" .. i
for _, pic in pairs(branch.pictures) do for _, pic in pairs(branch.pictures) do
pic.scale = (pic.scale or 1)/TREE_LEVELS*i pic.scale = (pic.scale or 1)/TREE_LEVELS*i
pic.hr_version.scale = (pic.hr_version.scale or 1)/TREE_LEVELS*i
end end
for _, pic in pairs(branch.shadows) do for _, pic in pairs(branch.shadows) do
pic.scale = (pic.scale or 1)/TREE_LEVELS*i pic.scale = (pic.scale or 1)/TREE_LEVELS*i
pic.hr_version.scale = (pic.hr_version.scale or 1)/TREE_LEVELS*i
end end
leaf = table.deepcopy(data.raw["optimized-particle"]["leaf-particle"]) leaf = table.deepcopy(data.raw["optimized-particle"]["leaf-particle"])
leaf.name = "bio-" .. leaf.name .. "-" .. i leaf.name = "bio-" .. leaf.name .. "-" .. i
for _, pic in pairs(leaf.pictures) do for _, pic in pairs(leaf.pictures) do
pic.scale = (pic.scale or 1)/TREE_LEVELS*math.max(2, i) 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 end
for _, pic in pairs(leaf.shadows) do for _, pic in pairs(leaf.shadows) do
pic.scale = (pic.scale or 1)/TREE_LEVELS*math.max(2, i) 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 end
data:extend({wooden, branch, leaf}) 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 variation.trunk.shift[2] = variation.trunk.shift[2]/TREE_LEVELS*i
end 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 -- 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 -- than 4 levels have been used originally, or it should be compared to just
-- TREE_LEVELS, not TREE_LEVELS/10 (i.e. typo) -- 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 variation.leaves.shift[2] = (variation.leaves.shift[2] or 0)/TREE_LEVELS*i
end 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.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.offset_deviation = {{-0.5, -0.5}, {0.5, 0.5}}
variation.leaf_generation.initial_height = 2/TREE_LEVELS*i 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[1] = (variation.shadow.shift[1] or 0)/TREE_LEVELS*i
variation.shadow.shift[2] = (variation.shadow.shift[2] or 0)/TREE_LEVELS*i variation.shadow.shift[2] = (variation.shadow.shift[2] or 0)/TREE_LEVELS*i
end 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 end
@ -219,7 +187,6 @@ for id, prototype in pairs(data.raw.tree) do
for _, variation in pairs(stump.animation) do for _, variation in pairs(stump.animation) do
variation.scale = (variation.scale or 1) * i / TREE_LEVELS variation.scale = (variation.scale or 1) * i / TREE_LEVELS
variation.hr_version = nil
variation.shift[1] = variation.shift[1]/TREE_LEVELS*i variation.shift[1] = variation.shift[1]/TREE_LEVELS*i
variation.shift[2] = variation.shift[2]/TREE_LEVELS*i variation.shift[2] = variation.shift[2]/TREE_LEVELS*i

View file

@ -211,13 +211,6 @@ if BI.Settings.BI_Bio_Fuel then
north = { north = {
layers = { 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", filename = ENTITYPATH .. "hr-boiler-N-idle.png",
priority = "extra-high", priority = "extra-high",
width = 269, width = 269,
@ -225,16 +218,8 @@ if BI.Settings.BI_Bio_Fuel then
shift = util.by_pixel(-1.25, 5.25), shift = util.by_pixel(-1.25, 5.25),
scale = 0.5, scale = 0.5,
tint = bio_boiler_tint, 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", filename = ENTITYPATH .. "hr-boiler-N-shadow.png",
priority = "extra-high", priority = "extra-high",
width = 274, width = 274,
@ -244,18 +229,10 @@ if BI.Settings.BI_Bio_Fuel then
draw_as_shadow = true, draw_as_shadow = true,
} }
} }
}
}, },
east = { east = {
layers = { 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", filename = ENTITYPATH .. "hr-boiler-E-idle.png",
priority = "extra-high", priority = "extra-high",
width = 216, width = 216,
@ -263,16 +240,8 @@ if BI.Settings.BI_Bio_Fuel then
shift = util.by_pixel(-3, 1.25), shift = util.by_pixel(-3, 1.25),
scale = 0.5, scale = 0.5,
tint = bio_boiler_tint, 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", filename = ENTITYPATH .. "hr-boiler-E-shadow.png",
priority = "extra-high", priority = "extra-high",
width = 184, width = 184,
@ -282,18 +251,10 @@ if BI.Settings.BI_Bio_Fuel then
draw_as_shadow = true, draw_as_shadow = true,
} }
} }
}
}, },
south = { south = {
layers = { 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", filename = ENTITYPATH .. "hr-boiler-S-idle.png",
priority = "extra-high", priority = "extra-high",
width = 260, width = 260,
@ -301,16 +262,8 @@ if BI.Settings.BI_Bio_Fuel then
shift = util.by_pixel(4, 13), shift = util.by_pixel(4, 13),
scale = 0.5, scale = 0.5,
tint = bio_boiler_tint, 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", filename = ENTITYPATH .. "hr-boiler-S-shadow.png",
priority = "extra-high", priority = "extra-high",
width = 311, width = 311,
@ -320,18 +273,10 @@ if BI.Settings.BI_Bio_Fuel then
draw_as_shadow = true, draw_as_shadow = true,
} }
} }
}
}, },
west = { west = {
layers = { 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", filename = ENTITYPATH .. "hr-boiler-W-idle.png",
priority = "extra-high", priority = "extra-high",
width = 196, width = 196,
@ -339,16 +284,8 @@ if BI.Settings.BI_Bio_Fuel then
shift = util.by_pixel(1.5, 7.75), shift = util.by_pixel(1.5, 7.75),
scale = 0.5, scale = 0.5,
tint = bio_boiler_tint, 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", filename = ENTITYPATH .. "hr-boiler-W-shadow.png",
priority = "extra-high", priority = "extra-high",
width = 206, width = 206,
@ -359,38 +296,20 @@ if BI.Settings.BI_Bio_Fuel then
} }
} }
} }
}
}, },
patch = { patch = {
east = { 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", filename = ENTITYPATH .. "hr-boiler-E-patch.png",
width = 6, width = 6,
height = 36, height = 36,
shift = util.by_pixel(33.5, -13.5), shift = util.by_pixel(33.5, -13.5),
scale = 0.5, scale = 0.5,
tint = bio_boiler_tint, tint = bio_boiler_tint,
}
}, },
}, },
fire_flicker_enabled = true, fire_flicker_enabled = true,
fire = { fire = {
north = { 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", filename = ENTITYPATH .. "hr-boiler-N-fire.png",
priority = "extra-high", priority = "extra-high",
frame_count = 64, frame_count = 64,
@ -400,18 +319,8 @@ if BI.Settings.BI_Bio_Fuel then
animation_speed = 0.5, animation_speed = 0.5,
shift = util.by_pixel(0, -8.5), shift = util.by_pixel(0, -8.5),
scale = 0.5 scale = 0.5
}
}, },
east = { 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", filename = ENTITYPATH .. "hr-boiler-E-fire.png",
priority = "extra-high", priority = "extra-high",
frame_count = 64, frame_count = 64,
@ -421,18 +330,8 @@ if BI.Settings.BI_Bio_Fuel then
animation_speed = 0.5, animation_speed = 0.5,
shift = util.by_pixel(-9.5, -22), shift = util.by_pixel(-9.5, -22),
scale = 0.5 scale = 0.5
}
}, },
south = { 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", filename = ENTITYPATH .. "hr-boiler-S-fire.png",
priority = "extra-high", priority = "extra-high",
frame_count = 64, frame_count = 64,
@ -442,18 +341,8 @@ if BI.Settings.BI_Bio_Fuel then
animation_speed = 0.5, animation_speed = 0.5,
shift = util.by_pixel(-1, -26.5), shift = util.by_pixel(-1, -26.5),
scale = 0.5 scale = 0.5
}
}, },
west = { 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", filename = ENTITYPATH .. "hr-boiler-W-fire.png",
priority = "extra-high", priority = "extra-high",
frame_count = 64, frame_count = 64,
@ -464,19 +353,10 @@ if BI.Settings.BI_Bio_Fuel then
shift = util.by_pixel(13, -23.25), shift = util.by_pixel(13, -23.25),
scale = 0.5 scale = 0.5
} }
}
}, },
fire_glow_flicker_enabled = true, fire_glow_flicker_enabled = true,
fire_glow = { fire_glow = {
north = { 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", filename = ENTITYPATH .. "hr-boiler-N-light.png",
priority = "extra-high", priority = "extra-high",
frame_count = 1, frame_count = 1,
@ -485,17 +365,8 @@ if BI.Settings.BI_Bio_Fuel then
shift = util.by_pixel(-1, -6.75), shift = util.by_pixel(-1, -6.75),
blend_mode = "additive", blend_mode = "additive",
scale = 0.5 scale = 0.5
}
}, },
east = { 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", filename = ENTITYPATH .. "hr-boiler-E-light.png",
priority = "extra-high", priority = "extra-high",
frame_count = 1, frame_count = 1,
@ -504,17 +375,8 @@ if BI.Settings.BI_Bio_Fuel then
shift = util.by_pixel(0.25, -13), shift = util.by_pixel(0.25, -13),
blend_mode = "additive", blend_mode = "additive",
scale = 0.5 scale = 0.5
}
}, },
south = { 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", filename = ENTITYPATH .. "hr-boiler-S-light.png",
priority = "extra-high", priority = "extra-high",
frame_count = 1, frame_count = 1,
@ -523,17 +385,8 @@ if BI.Settings.BI_Bio_Fuel then
shift = util.by_pixel(1, 5.5), shift = util.by_pixel(1, 5.5),
blend_mode = "additive", blend_mode = "additive",
scale = 0.5 scale = 0.5
}
}, },
west = { 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", filename = ENTITYPATH .. "hr-boiler-W-light.png",
priority = "extra-high", priority = "extra-high",
frame_count = 1, frame_count = 1,
@ -543,7 +396,6 @@ if BI.Settings.BI_Bio_Fuel then
blend_mode = "additive", blend_mode = "additive",
scale = 0.5 scale = 0.5
} }
}
}, },
burning_cooldown = 20 burning_cooldown = 20
}, },

View file

@ -7,57 +7,30 @@ local PIPEPATH = "__base__/graphics/entity/pipe-covers/"
function assembler2pipepicturesBioreactor() function assembler2pipepicturesBioreactor()
return { return {
north = { 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", filename = ICONPATH .. "empty.png",
priority = "extra-high", priority = "extra-high",
width = 1, width = 1,
height = 1, height = 1,
shift = util.by_pixel(2.25, 13.5), shift = util.by_pixel(2.25, 13.5),
scale = 0.5, scale = 0.5,
}
}, },
east = { 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", filename = ENTITYPATH .. "hr-assembling-machine-2-pipe-E.png",
priority = "extra-high", priority = "extra-high",
width = 42, width = 42,
height = 76, height = 76,
shift = util.by_pixel(-24.5, 1), shift = util.by_pixel(-24.5, 1),
scale = 0.5, scale = 0.5,
}
}, },
south = { 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", filename = ENTITYPATH .. "hr-assembling-machine-2-pipe-S.png",
priority = "extra-high", priority = "extra-high",
width = 88, width = 88,
height = 61, height = 61,
shift = util.by_pixel(0, -31.25), shift = util.by_pixel(0, -31.25),
scale = 0.5, scale = 0.5,
}
}, },
west = { 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", filename = ENTITYPATH .. "hr-assembling-machine-2-pipe-W.png",
priority = "extra-high", priority = "extra-high",
width = 39, width = 39,
@ -66,57 +39,33 @@ function assembler2pipepicturesBioreactor()
scale = 0.5, scale = 0.5,
} }
} }
}
end end
function pipecoverspicturesBioreactor() function pipecoverspicturesBioreactor()
return { return {
north = { north = {
filename = ICONPATH .. "empty.png",
priority = "extra-high",
width = 1,
height = 1,
hr_version = {
filename = ICONPATH .. "empty.png", filename = ICONPATH .. "empty.png",
priority = "extra-high", priority = "extra-high",
width = 1, width = 1,
height = 1, height = 1,
scale = 0.5 scale = 0.5
}
}, },
east = { east = {
filename = PIPEPATH .. "pipe-cover-east.png",
priority = "extra-high",
width = 64,
height = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-cover-east.png", filename = PIPEPATH .. "hr-pipe-cover-east.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
scale = 0.5 scale = 0.5
}
}, },
south = { south = {
filename = PIPEPATH .. "pipe-cover-south.png",
priority = "extra-high",
width = 64,
height = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-cover-south.png", filename = PIPEPATH .. "hr-pipe-cover-south.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
height = 128, height = 128,
scale = 0.5 scale = 0.5
}
}, },
west = { west = {
filename = PIPEPATH .. "pipe-cover-west.png",
priority = "extra-high",
width = 64,
height = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-cover-west.png", filename = PIPEPATH .. "hr-pipe-cover-west.png",
priority = "extra-high", priority = "extra-high",
width = 128, width = 128,
@ -124,5 +73,4 @@ function pipecoverspicturesBioreactor()
scale = 0.5 scale = 0.5
} }
} }
}
end end

View file

@ -269,14 +269,6 @@ data:extend({
size = 1, size = 1,
probability = 1, probability = 1,
}, },
--[[
{
picture = ENTITYPATH .. "solar2.png",
count = 1,
size = 2,
probability = 1,
},
]]
}, },
inner_corner = { inner_corner = {
picture = ENTITYPATH .. "solar-inner-corner.png", 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({ 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 ------- Boiler for Solar Plant / Boiler
{ {
type = "boiler", type = "boiler",
@ -612,12 +383,6 @@ data:extend({
priority = "high", priority = "high",
width = 288, width = 288,
height = 288, height = 288,
hr_version = {
filename = ENTITYPATH .. "Bio_Solar_Boiler.png",
priority = "high",
width = 288,
height = 288,
}
}, },
} }
}, },
@ -628,12 +393,6 @@ data:extend({
priority = "high", priority = "high",
width = 288, width = 288,
height = 288, height = 288,
hr_version = {
filename = ENTITYPATH .. "Bio_Solar_Boiler.png",
priority = "high",
width = 288,
height = 288,
}
}, },
}, },
}, },
@ -644,12 +403,6 @@ data:extend({
priority = "high", priority = "high",
width = 288, width = 288,
height = 288, height = 288,
hr_version = {
filename = ENTITYPATH .. "Bio_Solar_Boiler.png",
priority = "high",
width = 288,
height = 288,
}
}, },
} }
}, },
@ -660,12 +413,6 @@ data:extend({
priority = "high", priority = "high",
width = 288, width = 288,
height = 288, height = 288,
hr_version = {
filename = ENTITYPATH .. "Bio_Solar_Boiler.png",
priority = "high",
width = 288,
height = 288,
}
}, },
} }
} }
@ -683,16 +430,6 @@ data:extend({
shift = {0.09, -2.8}, shift = {0.09, -2.8},
scale = 1.5, scale = 1.5,
blend_mode = "additive", blend_mode = "additive",
hr_version = {
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",
}
}, },
east = { east = {
filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png",
@ -702,15 +439,6 @@ data:extend({
height = 62, height = 62,
shift = {0, -3}, shift = {0, -3},
blend_mode = "additive", blend_mode = "additive",
hr_version = {
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",
}
}, },
south = { south = {
filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png",
@ -720,15 +448,6 @@ data:extend({
height = 62, height = 62,
shift = {0, -3}, shift = {0, -3},
blend_mode = "additive", blend_mode = "additive",
hr_version = {
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",
}
}, },
west = { west = {
filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png", filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png",
@ -738,15 +457,6 @@ data:extend({
height = 62, height = 62,
shift = {0, -3}, shift = {0, -3},
blend_mode = "additive", blend_mode = "additive",
hr_version = {
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",
}
}, },
}, },
burning_cooldown = 20 burning_cooldown = 20

View file

@ -37,239 +37,132 @@ end
pipepictures_w = function() pipepictures_w = function()
return { return {
straight_vertical_single = { 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", filename = PIPEPATH .. "hr-pipe-straight-vertical-single.png",
priority = "extra-high", priority = "extra-high",
width = 160, width = 160,
height = 160, height = 160,
scale = 0.5 scale = 0.5
}
}, },
straight_vertical = { straight_vertical = {
filename = PIPEPATH .. "pipe-straight-vertical.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-straight-vertical.png", filename = PIPEPATH .. "hr-pipe-straight-vertical.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
straight_vertical_window = { 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", filename = PIPEPATH .. "hr-pipe-straight-vertical-window.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
straight_horizontal_window = { 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", filename = PIPEPATH .. "hr-pipe-straight-horizontal-window.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
straight_horizontal = { straight_horizontal = {
filename = PIPEPATH .. "pipe-straight-horizontal.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-straight-horizontal.png", filename = PIPEPATH .. "hr-pipe-straight-horizontal.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
corner_up_right = { 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", filename = PIPEPATH .. "hr-pipe-corner-up-right.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
corner_up_left = { 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", filename = PIPEPATH .. "hr-pipe-corner-up-left.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
corner_down_right = { 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", filename = PIPEPATH .. "hr-pipe-corner-down-right.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
corner_down_left = { 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", filename = PIPEPATH .. "hr-pipe-corner-down-left.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
t_up = { t_up = {
filename = PIPEPATH .. "pipe-t-up.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-t-up.png", filename = PIPEPATH .. "hr-pipe-t-up.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
t_down = { t_down = {
filename = PIPEPATH .. "pipe-t-down.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-t-down.png", filename = PIPEPATH .. "hr-pipe-t-down.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
t_right = { t_right = {
filename = PIPEPATH .. "pipe-t-right.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-t-right.png", filename = PIPEPATH .. "hr-pipe-t-right.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
t_left = { t_left = {
filename = PIPEPATH .. "pipe-t-left.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-t-left.png", filename = PIPEPATH .. "hr-pipe-t-left.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
cross = { cross = {
filename = PIPEPATH .. "pipe-cross.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-cross.png", filename = PIPEPATH .. "hr-pipe-cross.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
ending_up = { ending_up = {
filename = PIPEPATH .. "pipe-ending-up.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-ending-up.png", filename = PIPEPATH .. "hr-pipe-ending-up.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
ending_down = { ending_down = {
filename = PIPEPATH .. "pipe-ending-down.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-ending-down.png", filename = PIPEPATH .. "hr-pipe-ending-down.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
ending_right = { ending_right = {
filename = PIPEPATH .. "pipe-ending-right.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-ending-right.png", filename = PIPEPATH .. "hr-pipe-ending-right.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
ending_left = { ending_left = {
filename = PIPEPATH .. "pipe-ending-left.png",
priority = "extra-high",
size = 64,
hr_version = {
filename = PIPEPATH .. "hr-pipe-ending-left.png", filename = PIPEPATH .. "hr-pipe-ending-left.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
horizontal_window_background = { 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", filename = PIPEPATH .. "hr-pipe-horizontal-window-background.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
vertical_window_background = { 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", filename = PIPEPATH .. "hr-pipe-vertical-window-background.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
fluid_background = { fluid_background = {
filename = PIPEPATH .. "fluid-background.png",
priority = "extra-high",
width = 32,
height = 20,
hr_version = {
filename = PIPEPATH .. "hr-fluid-background.png", filename = PIPEPATH .. "hr-fluid-background.png",
priority = "extra-high", priority = "extra-high",
width = 64, width = 64,
height = 40, height = 40,
scale = 0.5 scale = 0.5
}
}, },
low_temperature_flow = { low_temperature_flow = {
filename = PIPEPATH .. "fluid-flow-low-temperature.png", filename = PIPEPATH .. "fluid-flow-low-temperature.png",
@ -290,15 +183,6 @@ pipepictures_w = function()
height = 18 height = 18
}, },
gas_flow = { 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", filename = PIPEPATH .. "hr-steam.png",
priority = "extra-high", priority = "extra-high",
line_length = 10, line_length = 10,
@ -309,7 +193,6 @@ pipepictures_w = function()
direction_count = 1 direction_count = 1
} }
} }
}
end end
---- Wood Floor ---- Wood Floor
@ -1244,169 +1127,33 @@ data:extend({
vehicle_impact_sound = sounds.generic_impact, vehicle_impact_sound = sounds.generic_impact,
pictures = { pictures = {
up = { 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", filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-up.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
down = { 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", filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-down.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
left = { 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", filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-left.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 scale = 0.5
}
}, },
right = { 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", filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-right.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
scale = 0.5 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 ------ Power to Rail Pole
-- Changed to medium-electric pole so the built entity resembles the icon (0.18.1) -- 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"]) --~ local my_pole = util.table.deepcopy(data.raw["electric-pole"]["small-electric-pole"])

View file

@ -143,15 +143,9 @@ function change_graphics (was_picture, sheet_element, quality)
if not sheet_element.shift then if not sheet_element.shift then
sheet_element.shift = {x = 0, y = 0} sheet_element.shift = {x = 0, y = 0}
end end
if (quality == "hq") and (was_picture.hr_version) then
--BioInd.writeDebug("hq")
picture = was_picture.hr_version
k = 2
else
--BioInd.writeDebug("lq") --BioInd.writeDebug("lq")
picture = was_picture picture = was_picture
k = 1 k = 1
end
--BioInd.writeDebug("%s Quality: %s", {sheet_element.number, quality}) --BioInd.writeDebug("%s Quality: %s", {sheet_element.number, quality})
if not (picture) then if not (picture) then

View file

@ -51,11 +51,9 @@ function set_tint_to_rails (rails_entities, tint)
for i, handler in pairs (global.rails) do for i, handler in pairs (global.rails) do
--handler.name = "straight_rail_horizontal" --handler.name = "straight_rail_horizontal"
local was_filename = handler.table.filename local was_filename = handler.table.filename
handler.table.filename = sheet_path_ties .. handler.name .. "-ties.png" handler.table.filename = sheet_path_ties .. "hr-" .. handler.name .. "-ties.png"
handler.table.hr_version.filename = sheet_path_ties .. "hr-" .. handler.name .. "-ties.png"
BioInd.writeDebug('Replaced: %s ===>>> %s', {was_filename, handler.table.filename}) BioInd.writeDebug('Replaced: %s ===>>> %s', {was_filename, handler.table.filename})
handler.table.tint = tint handler.table.tint = tint
handler.table.hr_version.tint = tint -- oops, i've forgot it, added in 0.0.3
end end
--BioInd.writeDebug("End rails") --------------------- --BioInd.writeDebug("End rails") ---------------------
end end
@ -82,11 +80,9 @@ end
for i, handler in pairs (global.remnants) do for i, handler in pairs (global.remnants) do
--remnants.name = "straight_rail_horizontal" --remnants.name = "straight_rail_horizontal"
local was_filename = handler.table.filename local was_filename = handler.table.filename
handler.table.filename = sheet_path_ties .. handler.name .. "-ties-remnants.png" handler.table.filename = sheet_path_ties .. "hr-" .. handler.name .. "-ties-remnants.png"
handler.table.hr_version.filename = sheet_path_ties .. "hr-" .. handler.name .. "-ties-remnants.png"
BioInd.writeDebug('Replaced: %s ===>>> %s', {was_filename, handler.table.filename}) BioInd.writeDebug('Replaced: %s ===>>> %s', {was_filename, handler.table.filename})
handler.table.tint = tint handler.table.tint = tint
handler.table.hr_version.tint = tint -- oops, i'mm forgot it, added in 0.0.3
end end
--BioInd.writeDebug("End remnants") --------------------- --BioInd.writeDebug("End remnants") ---------------------
end end

View file

@ -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"

View file

@ -2,32 +2,6 @@ local BioInd = require('common')('Bio_Industries')
local ICONPATH = BioInd.modRoot .. "/graphics/entities/wood_products/rails/" 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 = { local pix = {
"straight_rail_horizontal", "straight_rail_horizontal",
"straight_rail_vertical", "straight_rail_vertical",
@ -57,19 +31,15 @@ BioInd.show("direction", direction)
img = data.raw[rail_type]["bi-" .. rail_type .. "-wood-bridge"].pictures[pic] img = data.raw[rail_type]["bi-" .. rail_type .. "-wood-bridge"].pictures[pic]
img.stone_path.filename = FILE .. "stone-path.png" 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.filename = FILE.."stone-path-background.png"
img.stone_path_background.hr_version.filename = HR_FILE.."stone-path-background.png"
-- Remnants -- Remnants
img = data.raw["rail-remnants"][rail_type .. "-remnants-wood-bridge"].pictures[pic] img = data.raw["rail-remnants"][rail_type .. "-remnants-wood-bridge"].pictures[pic]
img.stone_path.filename = ICONPATH .. "remnants/remnants.png" 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.filename = ICONPATH .. "remnants/remnants.png"
img.stone_path_background.hr_version.filename = ICONPATH .. "remnants/hr-remnants.png"
end end
-- Localize remnants! -- Localize remnants!

View file

@ -200,7 +200,6 @@ BI.add_layer = function(layers, data)
BioInd.check_args(data, "table", "layer data") BioInd.check_args(data, "table", "layer data")
layers = layers or {} layers = layers or {}
local name = data.name
local hr_name = data.hr_name local hr_name = data.hr_name
local priority = data.priority local priority = data.priority
local height = data.height local height = data.height
@ -211,13 +210,6 @@ BI.add_layer = function(layers, data)
--~ size = size or --~ size = size or
--~ (height and width and height == width) and height --~ (height and width and height == width) and height
layers[#layers + 1] = { 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, filename = hr_name,
priority = priority or "low", priority = priority or "low",
width = width and width * 2, width = width and width * 2,
@ -226,7 +218,6 @@ BI.add_layer = function(layers, data)
draw_as_shadow = shadow, draw_as_shadow = shadow,
scale = 0.5, scale = 0.5,
} }
}
return layers return layers
end end

View file

@ -112,16 +112,6 @@ BioInd.show("radar.name", c_entities["bi-arboretum"].hidden[h_key].name)
radar.pictures = { radar.pictures = {
layers = { 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", filename = "__base__/graphics/entity/radar/hr-radar.png",
priority = "extra-high", priority = "extra-high",
width = 196, width = 196,
@ -134,7 +124,6 @@ BioInd.show("radar.name", c_entities["bi-arboretum"].hidden[h_key].name)
} }
} }
} }
}
BioInd.show("Adjusted properties of", radar_name) BioInd.show("Adjusted properties of", radar_name)
end end