Skip to content

Commit a11efa6

Browse files
kirazykirazy
committed
refactor: strip out compat patches
kirazy/reskins-bobs#56
1 parent 0d4579b commit a11efa6

File tree

12 files changed

+92
-244
lines changed

12 files changed

+92
-244
lines changed

‎data-final-fixes.lua‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,6 @@
66
----------------------------------------------------------------------------------------------------
77
-- ITEMS
88
----------------------------------------------------------------------------------------------------
9-
-- angelspetrochem at this version or earlier do icon work in data-final-fixes
10-
if reskins.lib.version.is_same_or_older(mods["angelspetrochem"], "0.9.19") then
11-
require("prototypes.items.petrochem")
12-
require("prototypes.items.petrochem.sulfur")
13-
end
14-
15-
-- angelssmelting at this version or earlier does icon work in data-final-fixes
16-
if reskins.lib.version.is_same_or_older(mods["angelssmelting"], "0.6.16") then
17-
require("prototypes.items.smelting")
18-
end
199

2010
----------------------------------------------------------------------------------------------------
2111
-- RECIPE ADJUSTMENTS

‎data-updates.lua‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,9 @@ require("prototypes.entity.refining.liquefier")
1919
----------------------------------------------------------------------------------------------------
2020
require("prototypes.items.refining-updates")
2121
require("prototypes.items.smelting.ores")
22-
23-
-- angelspetrochem at this version or earlier do icon work in data-final-fixes
24-
if reskins.lib.version.is_newer(mods["angelspetrochem"], "0.9.19") then
25-
require("prototypes.items.petrochem")
26-
require("prototypes.items.petrochem.sulfur")
27-
end
28-
29-
-- angelssmelting at this version or earlier does icon work in data-final-fixes
30-
if reskins.lib.version.is_newer(mods["angelssmelting"], "0.6.16") then
31-
require("prototypes.items.smelting-updates")
32-
end
22+
require("prototypes.items.petrochem")
23+
require("prototypes.items.petrochem.sulfur")
24+
require("prototypes.items.smelting-updates")
3325

3426
-- Second pass
3527
require("prototypes.items.refining-secondary-updates")

‎prototypes/entity/bioprocessing/algae-farm.lua‎

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,13 @@ local inputs = {
2020
}
2121

2222
local tier_map = {
23-
["algae-farm"] = { tier = 1 },
24-
["algae-farm-2"] = { tier = 2 },
25-
["algae-farm-3"] = { tier = 3 },
26-
["algae-farm-4"] = { tier = 4 },
23+
["algae-farm"] = { tier = 1, prog_tier = 0 },
24+
["algae-farm-2"] = { tier = 2, prog_tier = 1 },
25+
["algae-farm-3"] = { tier = 3, prog_tier = 2 },
26+
["algae-farm-4"] = { tier = 4, prog_tier = 3 },
27+
["algae-farm-5"] = { tier = 5, prog_tier = 4 }, -- Extended Angels
2728
}
2829

29-
-- Algae farm recipes revised in Angel's Bioprocessing 0.7.23
30-
if reskins.lib.version.is_same_or_newer(mods["angelsbioprocessing"], "0.7.23") then
31-
tier_map["algae-farm"].prog_tier = 0
32-
tier_map["algae-farm-2"].prog_tier = 1
33-
tier_map["algae-farm-3"].prog_tier = 2
34-
tier_map["algae-farm-4"].prog_tier = 3
35-
end
36-
37-
-- Algae farm recipes revised in Angel's Bioprocessing 0.7.18, and again in 0.7.20 with addition of Algae farm 4
38-
if reskins.lib.version.is_same_or_newer(mods["angelsbioprocessing"], "0.7.18") and reskins.lib.version.is_older(mods["angelsbioprocessing"], "0.7.20") then
39-
tier_map["algae-farm-3"].prog_tier = 4
40-
end
41-
42-
-- Sea Block 0.5.5 revises algae farm 3 recipe for earlier access
43-
if reskins.lib.version.is_same_or_newer(mods["SeaBlock"], "0.5.5") then
44-
tier_map["algae-farm"].prog_tier = 0
45-
tier_map["algae-farm-2"].prog_tier = 1
46-
tier_map["algae-farm-3"].prog_tier = 2
47-
tier_map["algae-farm-4"].prog_tier = 3
48-
end
49-
50-
-- Extended Angel's adds a 5th tier of Algae farm in version 0.5.0, prior to that Algae farm 4 had tier 5 ingredients
51-
if reskins.lib.version.is_same_or_newer(mods["extendedangels"], "0.5.10") then
52-
tier_map["algae-farm-5"] = { tier = 5, prog_tier = 4 }
53-
elseif reskins.lib.version.is_same_or_newer(mods["extendedangels"], "0.5.0") then
54-
tier_map["algae-farm-5"] = { tier = 5 }
55-
elseif mods["extendedangels"] and reskins.lib.version.is_older(mods["angelsbioprocessing"], "0.7.20") then
56-
tier_map["algae-farm-4"].prog_tier = 5
57-
end
58-
5930
-- Reskin entities, create and assign extra details
6031
for name, map in pairs(tier_map) do
6132
---@type data.AssemblingMachinePrototype

‎prototypes/entity/petrochem.lua‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,13 @@ local chemical_plants = {
2121
["angels-chemical-plant-4"] = { tier = 4 },
2222
}
2323

24-
-- Chemical plant recipes revised in Angel's Petrochem 0.9.18, and then "reverted" in Angel's Petrochem 0.9.23
25-
if reskins.lib.version.is_same_or_newer(mods["angelspetrochem"], "0.9.18") and reskins.lib.version.is_older(mods["angelspetrochem"], "0.9.23") then
26-
chemical_plants["angels-chemical-plant"].prog_tier = 2
27-
chemical_plants["angels-chemical-plant-2"].prog_tier = 3
28-
chemical_plants["angels-chemical-plant-3"].prog_tier = 4
29-
chemical_plants["angels-chemical-plant-4"].prog_tier = 5
30-
end
31-
32-
-- Sea Block 0.5.5 revises chemical plant recipe for earlier access, but obviated with Angel's Petrochem 0.9.23
33-
if reskins.lib.version.is_same_or_newer(mods["SeaBlock"], "0.5.5") and reskins.lib.version.is_older(mods["angelspetrochem"], "0.9.23") then
34-
chemical_plants["angels-chemical-plant"].prog_tier = 1
35-
end
24+
local use_vanilla_chemical_plant_sprites = reskins.lib.settings.get_value("reskins-angels-use-vanilla-chemical-plant-sprites") and reskins.lib.settings.get_value("angels-disable-vanilla-chemical-plants")
3625

3726
for name, map in pairs(chemical_plants) do
38-
if reskins.lib.settings.get_value("reskins-angels-use-vanilla-chemical-plant-sprites") and reskins.lib.settings.get_value("angels-disable-vanilla-chemical-plants") then
39-
reskins.lib.apply_skin.chemical_plant(name, (reskins.lib.settings.get_value("reskins-lib-tier-mapping") == "progression-map") and map.prog_tier or map.tier)
27+
local tier = reskins.lib.tiers.get_tier(map)
28+
if use_vanilla_chemical_plant_sprites then
29+
reskins.lib.apply_skin.chemical_plant(name, tier)
4030
else
41-
reskins.lib.apply_skin.angels_chemical_plant(name, (reskins.lib.settings.get_value("reskins-lib-tier-mapping") == "progression-map") and map.prog_tier or map.tier)
31+
reskins.lib.apply_skin.angels_chemical_plant(name, tier)
4232
end
4333
end

‎prototypes/entity/petrochem/electric-boiler.lua‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,11 @@ local inputs = {
2020
}
2121

2222
local tier_map = {
23-
["angels-electric-boiler"] = { tier = 1 },
24-
["angels-electric-boiler-2"] = { tier = 2 },
25-
["angels-electric-boiler-3"] = { tier = 3 },
23+
["angels-electric-boiler"] = { tier = 1, prog_tier = 2 },
24+
["angels-electric-boiler-2"] = { tier = 2, prog_tier = 3 },
25+
["angels-electric-boiler-3"] = { tier = 3, prog_tier = 5 },
2626
}
2727

28-
-- Electric boiler recipes revised in Angel's Petrochem 0.9.18
29-
if reskins.lib.version.is_same_or_newer(mods["angelspetrochem"], "0.9.18") then
30-
tier_map["angels-electric-boiler"].prog_tier = 2
31-
tier_map["angels-electric-boiler-2"].prog_tier = 3
32-
tier_map["angels-electric-boiler-3"].prog_tier = 5
33-
end
34-
3528
local working_lights = reskins.lib.sprites.make_4way_animation_from_spritesheet({
3629
filename = "__reskins-angels__/graphics/entity/petrochem/electric-boiler/electric-boiler-working-lights.png",
3730
priority = "extra-high",

‎prototypes/entity/refining/electrowinning-cell.lua‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,11 @@ local inputs = {
2020
}
2121

2222
local tier_map = {
23-
["electro-whinning-cell"] = { tier = 1, prog_tier = 3 },
24-
["electro-whinning-cell-2"] = { tier = 2, prog_tier = 4 },
25-
["electro-whinning-cell-3"] = { tier = 3, prog_tier = 5 },
23+
["electro-whinning-cell"] = { tier = 1, prog_tier = 4 },
24+
["electro-whinning-cell-2"] = { tier = 2, prog_tier = 5 },
25+
["electro-whinning-cell-3"] = { tier = 3, prog_tier = 6 }, -- FIXME: This may no longer exist.
2626
}
2727

28-
if reskins.lib.version.is_same_or_newer(mods["angelsrefining"], "0.12.5") then
29-
tier_map["electro-whinning-cell"].prog_tier = 4
30-
tier_map["electro-whinning-cell-2"].prog_tier = 5
31-
end
32-
3328
-- Reskin entities, create and assign extra details
3429
for name, map in pairs(tier_map) do
3530
---@type data.AssemblingMachinePrototype

‎prototypes/entity/refining/hydro-plant.lua‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,9 @@ local tier_map = {
2323
["hydro-plant"] = { tier = 1 },
2424
["hydro-plant-2"] = { tier = 2 },
2525
["hydro-plant-3"] = { tier = 3 },
26-
27-
-- Extended Angels
28-
["hydro-plant-4"] = { tier = 4, prog_tier = 5 },
26+
["hydro-plant-4"] = { tier = 4 }, -- Extended Angels
2927
}
3028

31-
if reskins.lib.version.is_same_or_newer(mods["extendedangels"], "0.5.10") then
32-
tier_map["hydro-plant-4"].prog_tier = nil
33-
end
34-
3529
-- Reskin entities, create and assign extra details
3630
for name, map in pairs(tier_map) do
3731
---@type data.AssemblingMachinePrototype

‎prototypes/entity/smelting/ore-processing-machine.lua‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,12 @@ local inputs = {
2020
}
2121

2222
local tier_map = {
23-
["ore-processing-machine"] = { tier = 1 },
24-
["ore-processing-machine-2"] = { tier = 2 },
25-
["ore-processing-machine-3"] = { tier = 3 },
26-
["ore-processing-machine-4"] = { tier = 4 },
23+
["ore-processing-machine"] = { tier = 1, prog_tier = 2 },
24+
["ore-processing-machine-2"] = { tier = 2, prog_tier = 3 },
25+
["ore-processing-machine-3"] = { tier = 3, prog_tier = 4 },
26+
["ore-processing-machine-4"] = { tier = 4, prog_tier = 5 },
2727
}
2828

29-
-- Support rework of Angel's Smelting ingredient tiers
30-
if reskins.lib.version.is_same_or_newer(mods["angelssmelting"], "0.6.20") then
31-
tier_map["ore-processing-machine"].prog_tier = 2
32-
tier_map["ore-processing-machine-2"].prog_tier = 3
33-
tier_map["ore-processing-machine-3"].prog_tier = 4
34-
tier_map["ore-processing-machine-4"].prog_tier = 5
35-
end
36-
3729
-- Reskin entities, create and assign extra details
3830
for name, map in pairs(tier_map) do
3931
---@type data.AssemblingMachinePrototype

‎prototypes/entity/smelting/pellet-press.lua‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,12 @@ local inputs = {
2020
}
2121

2222
local tier_map = {
23-
["pellet-press"] = { tier = 1 },
24-
["pellet-press-2"] = { tier = 2 },
25-
["pellet-press-3"] = { tier = 3 },
26-
["pellet-press-4"] = { tier = 4 },
23+
["pellet-press"] = { tier = 1, prog_tier = 3 },
24+
["pellet-press-2"] = { tier = 2, prog_tier = 4 },
25+
["pellet-press-3"] = { tier = 3, prog_tier = 5 },
26+
["pellet-press-4"] = { tier = 4, prog_tier = 6 },
2727
}
2828

29-
-- Support rework of Angel's Smelting ingredient tiers
30-
if reskins.lib.version.is_same_or_newer(mods["angelssmelting"], "0.6.20") then
31-
tier_map["pellet-press"].prog_tier = 3
32-
tier_map["pellet-press-2"].prog_tier = 4
33-
tier_map["pellet-press-3"].prog_tier = 5
34-
tier_map["pellet-press-4"].prog_tier = 6
35-
end
36-
3729
-- Reskin entities, create and assign extra details
3830
for name, map in pairs(tier_map) do
3931
---@type data.AssemblingMachinePrototype

‎prototypes/entity/smelting/powder-mixer.lua‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,12 @@ local inputs = {
2020
}
2121

2222
local tier_map = {
23-
["powder-mixer"] = { tier = 1 },
24-
["powder-mixer-2"] = { tier = 2 },
25-
["powder-mixer-3"] = { tier = 3 },
26-
["powder-mixer-4"] = { tier = 4 },
23+
["powder-mixer"] = { tier = 1, prog_tier = 2 },
24+
["powder-mixer-2"] = { tier = 2, prog_tier = 3 },
25+
["powder-mixer-3"] = { tier = 3, prog_tier = 4 },
26+
["powder-mixer-4"] = { tier = 4, prog_tier = 5 },
2727
}
2828

29-
-- Support rework of Angel's Smelting ingredient tiers
30-
if reskins.lib.version.is_same_or_newer(mods["angelssmelting"], "0.6.20") then
31-
tier_map["powder-mixer"].prog_tier = 2
32-
tier_map["powder-mixer-2"].prog_tier = 3
33-
tier_map["powder-mixer-3"].prog_tier = 4
34-
tier_map["powder-mixer-4"].prog_tier = 5
35-
end
36-
3729
-- Reskin entities, create and assign extra details
3830
for name, map in pairs(tier_map) do
3931
---@type data.AssemblingMachinePrototype

0 commit comments

Comments
 (0)