Skip to content

Commit f485157

Browse files
committed
Add bauxite, tin, tungsten ores and icons
1 parent 690e854 commit f485157

File tree

16 files changed

+8
-9
lines changed

16 files changed

+8
-9
lines changed

changelog.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---------------------------------------------------------------------------------------------------
22
Version: 1.0.4
33
Date: 2020.10.04
4+
Features:
5+
- Implemented bauxite, tin, and tungsten ores
46
Changes:
57
- Moved ores common with Angels mods into Artisanal Reskins: Library to support Artisanal Reskins: Angel's mods
68
---------------------------------------------------------------------------------------------------
Loading
Loading
1.98 MB
Loading
528 KB
Loading
Loading
Loading
12.1 KB
Loading
12.8 KB
Loading
12.2 KB
Loading
11.5 KB
Loading
10.7 KB
Loading
10.7 KB
Loading
11.1 KB
Loading
12.8 KB
Loading

prototypes/entity/ores/ores.lua

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,21 @@ local ores = {
2222
["rutile-ore"] = {},
2323
["sulfur"] = {},
2424
["thorium-ore"] = {},
25-
-- ["tin-ore"] = {},
25+
["tin-ore"] = {variations = 8},
2626

2727
-- Shared with Angel's
28-
-- ["bauxite-ore"] = {mod = "lib", group = "shared"},
28+
["bauxite-ore"] = {mod = "lib", group = "shared", variations = 8},
2929
["cobalt-ore"] = {mod = "lib", group = "shared"},
3030
["gold-ore"] = {mod = "lib", group = "shared"},
3131
["nickel-ore"] = {mod = "lib", group = "shared"}, -- 408073
3232
["quartz"] = {mod = "lib", group = "shared"}, -- 999999
3333
["silver-ore"] = {mod = "lib", group = "shared"},
34-
-- ["tungsten-ore"] = {mod = "lib", group = "shared"},
34+
["tungsten-ore"] = {mod = "lib", group = "shared", variations = 8},
3535
["zinc-ore"] = {mod = "lib", group = "shared"},
3636
}
3737

38+
39+
3840
for name, params in pairs(ores) do
3941
-- Fetch entity
4042
local entity = data.raw[inputs.type][name]
@@ -52,12 +54,7 @@ for name, params in pairs(ores) do
5254
inputs.icon_picture = nil
5355
else
5456
inputs.icon = reskins[mod].directory.."/graphics/icons/"..group.."/ores/"..name.."/"..name..".png"
55-
inputs.icon_picture = {
56-
{ size = 64, filename = reskins[mod].directory.."/graphics/icons/"..group.."/ores/"..name.."/"..name..".png", scale = 0.25, mipmap_count = 4 },
57-
{ size = 64, filename = reskins[mod].directory.."/graphics/icons/"..group.."/ores/"..name.."/"..name.."-1.png", scale = 0.25, mipmap_count = 4 },
58-
{ size = 64, filename = reskins[mod].directory.."/graphics/icons/"..group.."/ores/"..name.."/"..name.."-2.png", scale = 0.25, mipmap_count = 4 },
59-
{ size = 64, filename = reskins[mod].directory.."/graphics/icons/"..group.."/ores/"..name.."/"..name.."-3.png", scale = 0.25, mipmap_count = 4 }
60-
}
57+
inputs.icon_picture = reskins.lib.ore_icon_pictures(mod, group, name, params.variations or 4)
6158
end
6259

6360
reskins.lib.assign_icons(name, inputs)

0 commit comments

Comments
 (0)