Skip to content

Commit

Permalink
scale info icons for the tailings pond
Browse files Browse the repository at this point in the history
  • Loading branch information
@notnotmelon
notnotmelon committed Jan 17, 2024
1 parent 614d84e commit 0e3fff8
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 143 deletions.
2 changes: 2 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Version: 2.1.10
Date: 2024-1-??
Changes:
- In order to prep for Factorio 2.0: Removed all filter inserters and filter stack inserters. Gave filter slots to all other inserters. A migration will automatically transform existing filter inserters in your base.
- Rewrote the wiki page for inserters.
- Add compatibility for Better Victory Screen (stringweasel).
- Fixed pycodex search (https://github.com/pyanodon/pybugreports/issues/370)
- Fixed a rare crash when trying to close the pycodex
Expand All @@ -15,6 +16,7 @@ Date: 2024-1-??
- Added way more info to the pycodex about tailings ponds
- Added purest-nitrogen-gas, hot air, pressurized air, and neon to the non polluting gasses list.
- Fixed graphical error when polluted tiles were placed next to burnt polluted tiles
- Tailings pond ALT-mode icons are now scaled to the building size instead of being microscopic
- Improved UPS of tailings ponds
Beacons:
- INFO: The following 2 changes are toggleable in the mod settings.
Expand Down
204 changes: 63 additions & 141 deletions prototypes/buildings/tailings-pond.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,123 +24,45 @@ ITEM {
stack_size = 10
}

--[[
ENTITY {
type = 'storage-tank',
name = 'tailings-pond',
icon = '__pycoalprocessinggraphics__/graphics/icons/tailings-pond.png',
icon_size = 64,
flags = {'placeable-player', 'player-creation'},
minable = {mining_time = 3, result = 'tailings-pond'},
max_health = 500,
corpse = 'big-remnants',
collision_box = {{-2.4, -2.4}, {2.4, 2.4}},
selection_box = {{-2.5, -2.5}, {2.5, 2.5}},
two_direction_only = true,
fluid_box = {
base_area = (100000 / 100),
pipe_covers = DATA.Pipes.covers(true, true, true, true),
pipe_connections = {
{position = {0, -3}},
{position = {0, 3}},
{position = {3, 0}},
{position = {-3, 0}}
-- Make tailings pond sprites
local pictures = {}
local i = 1
for y = 0, 2112 - 352, 352 do
for x = 0, 2240 - 448, 448 do
pictures[#pictures + 1] = {
type = 'sprite',
name = 'tailings-pond-sprite-' .. i,
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/fluid.png',
priority = 'extra-high',
width = 448,
height = 352,
x = x,
y = y,
draw_as_glow = true
}
},
window_bounding_box = {{-2.4, -2.4}, {2.4, 2.4}},
pictures = {
picture = {
sheet = {
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/tailings-pond-frame.png',
priority = 'high',
frames = 1,
width = 171,
height = 185
}
},
fluid_background = DATA.Sprites.empty_sprite(),
window_background = {
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/window-background.png',
priority = 'low',
width = 171,
height = 185,
draw_as_shadow = true
},
flow_sprite = DATA.Sprites.empty_sprite(),
gas_flow = DATA.Sprites.empty_animation()
},
flow_length_in_ticks = 360,
vehicle_impact_sound = {filename = '__base__/sound/car-metal-impact.ogg', volume = 0.65},
working_sound = {
sound = {
filename = '__base__/sound/storage-tank.ogg',
volume = 0.8
},
apparent_volume = 1.5,
max_sounds_per_type = 3
},
circuit_wire_connection_points = {
{
shadow = {red = {2.546875, -2.4375}, green = {2.546875, -2.4375}},
wire = {red = {2.546875, -2.4375}, green = {2.546875, -2.4375}}
},
{
shadow = {red = {2.546875, -2.4375}, green = {2.546875, -2.4375}},
wire = {red = {2.546875, -2.4375}, green = {2.546875, -2.4375}}
},
{
shadow = {red = {2.546875, -2.4375}, green = {2.546875, -2.4375}},
wire = {red = {2.546875, -2.4375}, green = {2.546875, -2.4375}}
},
{
shadow = {red = {2.546875, -2.4375}, green = {2.546875, -2.4375}},
wire = {red = {2.546875, -2.4375}, green = {2.546875, -2.4375}}
}
},
circuit_wire_max_distance = 9,
circuit_connector_sprites = _G.circuit_connector_definitions['storage-tank'].sprites
}
]]--

do -- Make tailings pond sprites
local pictures = {}
local i = 1
for y = 0, 2112 - 352, 352 do
for x = 0, 2240 - 448, 448 do
pictures[#pictures + 1] = {
type = 'sprite',
name = 'tailings-pond-sprite-' .. i,
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/fluid.png',
priority = 'extra-high',
width = 448,
height = 352,
x = x,
y = y
}
i = i + 1
end
i = i + 1
end
data:extend(pictures)
end
data:extend(pictures)

local blank_png = {
filename = "__core__/graphics/empty.png",
filename = '__core__/graphics/empty.png',
height = 1,
priority = "extra-high",
priority = 'extra-high',
width = 1
}

ENTITY{
type = "storage-tank",
name = "tailings-pond",
icon = "__pycoalprocessinggraphics__/graphics/icons/tailings-pond.png",
type = 'storage-tank',
name = 'tailings-pond',
icon = '__pycoalprocessinggraphics__/graphics/icons/tailings-pond.png',
icon_size = 64,
flags = {"placeable-player", "player-creation", "not-rotatable"},
minable = {mining_time = 0.5, result = "tailings-pond"},
flags = {'placeable-player', 'player-creation', 'not-rotatable'},
minable = {mining_time = 0.5, result = 'tailings-pond'},
max_health = 500,
corpse = "big-remnants",
scale_info_icons = false,
dying_explosion = "storage-tank-explosion",
corpse = 'big-remnants',
scale_info_icons = true,
dying_explosion = 'storage-tank-explosion',
collision_box = {{-8.9, -8.9}, {8.9, 8.9}},
selection_box = {{-9, -9}, {9, 9}},
fluid_box =
Expand All @@ -151,46 +73,46 @@ ENTITY{
north = {
layers = {
{
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-north.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-north.png',
height = 64,
width = 64,
shift = {0, -0.25},
priority = "extra-high",
priority = 'extra-high',
hr_version = {
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-north.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-north.png',
height = 128,
width = 128,
scale = 0.5,
shift = {0, -0.25},
priority = "extra-high",
priority = 'extra-high',
},
},
{
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-north-shadow.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-north-shadow.png',
height = 64,
width = 64,
shift = {0, -0.25},
priority = "extra-high",
priority = 'extra-high',
draw_as_shadow = true,
hr_version = {
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-north-shadow.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-north-shadow.png',
height = 128,
width = 128,
scale = 0.5,
shift = {0, -0.25},
priority = "extra-high",
priority = 'extra-high',
draw_as_shadow = true
},
}
}
},
east = {
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/east-pipe.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/east-pipe.png',
width = 64,
height = 64,
shift = {-0.5, 0},
hr_version = {
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/hr-east-pipe.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/hr-east-pipe.png',
width = 128,
height = 128,
scale = 0.5,
Expand All @@ -200,34 +122,34 @@ ENTITY{
south = {
layers = {
{
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-north.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-north.png',
height = 64,
width = 64,
shift = {0, -0.7},
priority = "extra-high",
priority = 'extra-high',
hr_version = {
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-north.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-north.png',
height = 128,
width = 128,
scale = 0.5,
shift = {0, -0.7},
priority = "extra-high",
priority = 'extra-high',
},
},
{
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-north-shadow.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-north-shadow.png',
height = 64,
width = 64,
shift = {0, -0.7},
priority = "extra-high",
priority = 'extra-high',
draw_as_shadow = true,
hr_version = {
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-north-shadow.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-north-shadow.png',
height = 128,
width = 128,
scale = 0.5,
shift = {0, -0.7},
priority = "extra-high",
priority = 'extra-high',
draw_as_shadow = true
},
}
Expand All @@ -241,34 +163,34 @@ ENTITY{
south = {
layers = {
{
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-south.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-south.png',
height = 64,
width = 64,
shift = {0, 0.5},
priority = "extra-high",
priority = 'extra-high',
hr_version = {
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-south.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-south.png',
height = 128,
width = 128,
scale = 0.5,
shift = {0, 0.5},
priority = "extra-high",
priority = 'extra-high',
},
},
{
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-south-shadow.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-south-shadow.png',
height = 64,
width = 64,
shift = {0, 0.5},
priority = "extra-high",
priority = 'extra-high',
draw_as_shadow = true,
hr_version = {
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-south-shadow.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-south-shadow.png',
height = 128,
width = 128,
scale = 0.5,
shift = {0, 0.5},
priority = "extra-high",
priority = 'extra-high',
draw_as_shadow = true
},
}
Expand All @@ -277,34 +199,34 @@ ENTITY{
west = {
layers = {
{
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-west.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-west.png',
height = 64,
width = 64,
shift = {-0.3, 0},
priority = "extra-high",
priority = 'extra-high',
hr_version = {
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-west.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-west.png',
height = 128,
width = 128,
scale = 0.5,
shift = {-0.3, 0},
priority = "extra-high",
priority = 'extra-high',
},
},
{
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-west-shadow.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/pipe-cover-west-shadow.png',
height = 64,
width = 64,
shift = {-0.3, 0},
priority = "extra-high",
priority = 'extra-high',
draw_as_shadow = true,
hr_version = {
filename = "__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-west-shadow.png",
filename = '__pycoalprocessinggraphics__/graphics/entity/tailings-pond/covers/hr-pipe-cover-west-shadow.png',
height = 128,
width = 128,
scale = 0.5,
shift = {-0.3, 0},
priority = "extra-high",
priority = 'extra-high',
draw_as_shadow = true
},
}
Expand All @@ -327,7 +249,7 @@ ENTITY{
{ position = {-9.25, -1.5} },
{ position = {-9.25, -2.5} },
},
production_type = "input-output",
production_type = 'input-output',
hide_connection_info = false
},
window_bounding_box = {{-9, -9}, {9, 9}},
Expand Down Expand Up @@ -365,7 +287,7 @@ ENTITY{
{
sound =
{
filename = "__base__/sound/storage-tank.ogg",
filename = '__base__/sound/storage-tank.ogg',
volume = 0.6
},
match_volume_to_activity = true,
Expand Down
2 changes: 1 addition & 1 deletion scripts/tailings-pond.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ local function set_fluid_level_image(pond)
end
pond.sprite = rendering.draw_sprite{
sprite = 'tailings-pond-sprite-' .. fill_level,
render_layer = 'higher-object-under',
render_layer = 'object',
target = pond.entity,
target_offset = {0, -0.5},
surface = pond.entity.surface,
Expand Down
1 change: 0 additions & 1 deletion scripts/wiki/statistics-page.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ local function add_statistic(gui, localised_string)
gui[name].caption = localised_string
else
gui.add{type = 'label', caption = localised_string, name = name}.style.single_line = false
gui.add{type = 'label', caption = ''}
end
end

Expand Down

0 comments on commit 0e3fff8

Please sign in to comment.