Skip to content

Commit 8d0d281

Browse files
KiwiHawkKiwiHawk
committed
Update Bob's Prototype Names #1286 
1 parent 533a63e commit 8d0d281

6 files changed

Lines changed: 17 additions & 49 deletions

File tree

‎angelspetrochem/prototypes/override/bobrevamp.lua‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ if mods["bobrevamp"] and mods["bobplates"] then
4141
},
4242
})
4343
end
44-
if mods["bobclasses"] then
45-
OV.add_prereq("bob-rtg", "angels-coal-processing-3")
46-
else
47-
OV.add_prereq("bob-rtg", "angels-sodium-processing-2")
48-
end
44+
OV.add_prereq("bob-rtg", "angels-sodium-processing-2")
4945
end
5046
end

‎angelsrefining/data.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if mods["bobplates"] then
7474
angelsmods.trigger.ores["silver"] = ore_exists("bob-silver-ore")
7575
angelsmods.trigger.ores["titanium"] = ore_exists("bob-rutile-ore")
7676
angelsmods.trigger.ores["gold"] = ore_exists("bob-gold-ore")
77-
angelsmods.trigger.ores["tungsten"] = ore_exists("bob-tungsten-ore")
77+
angelsmods.trigger.ores["tungsten"] = ore_exists("tungsten-ore")
7878
angelsmods.trigger.ores["thorium"] = angelsmods.trigger.ores["thorium"] or ore_exists("bob-thorium-ore")
7979
--angelsmods.trigger.ores["gem-ore"] = ore_exists("gem-ore")
8080
--angelsmods.trigger.ores["gem-ruby"] = ore_exists("ruby-ore")

‎angelsrefining/prototypes/angels-functions.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1860,7 +1860,7 @@ function angelsmods.functions.get_trigger_names()
18601860
["bob-silver-ore"] = "silver",
18611861
["bob-thorium-ore"] = "thorium",
18621862
["bob-tin-ore"] = "tin",
1863-
["bob-tungsten-ore"] = "tungsten",
1863+
["tungsten-ore"] = "tungsten",
18641864
["bob-zinc-ore"] = "zinc",
18651865
}
18661866
end
@@ -1898,7 +1898,7 @@ function angelsmods.functions.get_ore_name(ore_name)
18981898
["angels-silver-ore"] = mods["bobores"] and "bob-silver-ore" or "angels-silver-ore",
18991899
["angels-thorium-ore"] = mods["bobores"] and "bob-thorium-ore" or "angels-thorium-ore",
19001900
["angels-tin-ore"] = mods["bobores"] and "bob-tin-ore" or "angels-tin-ore",
1901-
["angels-tungsten-ore"] = mods["bobores"] and "bob-tungsten-ore" or "angels-tungsten-ore",
1901+
["angels-tungsten-ore"] = mods["bobores"] and "tungsten-ore" or "angels-tungsten-ore",
19021902
["uranium-ore"] = "uranium-ore",
19031903
["angels-zinc-ore"] = mods["bobores"] and "bob-zinc-ore" or "angels-zinc-ore",
19041904
}

‎angelsrefining/prototypes/generation/angels-override.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if not angelsmods.refining.disable_ore_override then
2424
angelsmods.functions.remove_resource("bob-silver-ore")
2525
angelsmods.functions.remove_resource("bob-sulfur")
2626
angelsmods.functions.remove_resource("bob-tin-ore")
27-
angelsmods.functions.remove_resource("bob-tungsten-ore")
27+
angelsmods.functions.remove_resource("tungsten-ore")
2828
angelsmods.functions.remove_resource("bob-zinc-ore")
2929
angelsmods.functions.remove_resource("bob-lithia-water")
3030
angelsmods.functions.remove_resource("bob-ground-water")

‎angelsrefining/prototypes/recipe-builder-fallbacks.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ angelsmods.functions.RB.set_fallback("item", "t4-plate", {
7676
})
7777
angelsmods.functions.RB.set_fallback("item", "t5-plate", {
7878
{ "block-construction-5" },
79-
{ "bob-tungsten-plate", 4 },
79+
{ "tungsten-plate", 4 },
8080
{
8181
"angels-plate-tungsten",
8282
4,
@@ -89,7 +89,7 @@ angelsmods.functions.RB.set_fallback("item", "t5-plate", {
8989
angelsmods.functions.RB.set_fallback("item", "t6-plate", {
9090
{ "block-construction-5" },
9191
{
92-
"bob-tungsten-carbide",
92+
"tungsten-carbide",
9393
4,
9494
function(t, n)
9595
return mods["angelssmelting"] and angelsmods.trigger.smelting_products["tungsten"].plate or false

‎angelssmelting/prototypes/override/smelting-override-tungsten.lua‎

Lines changed: 10 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ end
1111
if angelsmods.trigger.ores["tungsten"] then
1212
if mods["bobores"] then
1313
local angel_ore = data.raw.item["angels-tungsten-ore"]
14-
local bob_ore = data.raw.item["bob-tungsten-ore"]
14+
local bob_ore = data.raw.item["tungsten-ore"]
1515
OV.global_replace_item(angel_ore.name, bob_ore.name)
1616
OV.copy_item_properties(angel_ore.name, bob_ore.name)
1717
angelsmods.functions.hide(angel_ore.name)
@@ -61,55 +61,28 @@ end
6161
if angelsmods.trigger.smelting_products["tungsten"].plate then
6262
-- REPLACE ITEMS (use bob version)
6363
if mods["bobplates"] then
64-
OV.global_replace_item("angels-plate-tungsten", "bob-tungsten-plate")
64+
OV.global_replace_item("angels-plate-tungsten", "tungsten-plate")
6565
angelsmods.functions.hide("angels-plate-tungsten")
66-
OV.copy_item_properties("angels-plate-tungsten", "bob-tungsten-plate")
67-
OV.disable_recipe({ "bob-tungsten-plate" })
66+
OV.copy_item_properties("angels-plate-tungsten", "tungsten-plate")
67+
OV.disable_recipe({ "tungsten-plate" })
6868
OV.add_prereq("bob-tungsten-processing", "angels-tungsten-smelting-1")
69-
OV.set_research_difficulty("bob-tungsten-processing", "bob-tungsten-plate", 10, "craft-item")
69+
OV.set_research_difficulty("bob-tungsten-processing", "tungsten-plate", 10, "craft-item")
7070

7171
angelsmods.functions.move_item("bob-copper-tungsten-alloy", "angels-tungsten-casting", "l")
72-
angelsmods.functions.move_item("bob-tungsten-carbide", "angels-tungsten-casting", "k")
72+
angelsmods.functions.move_item("tungsten-carbide", "angels-tungsten-casting", "k")
7373
OV.patch_recipes({
7474
{
75-
name = "bob-tungsten-carbide",
76-
subgroup = "angels-tungsten-casting",
77-
energy_required = 6,
78-
ingredients = {
79-
{ type = "item", name = "bob-tungsten-oxide", amount = 10 },
80-
{ type = "item", name = "angels-solid-carbon", amount = 10 },
81-
},
82-
results = {
83-
{ type = "item", name = "bob-tungsten-carbide", amount = 20 },
84-
},
85-
order = "k[tungsten-carbide]-a",
86-
icons = angelsmods.functions.add_number_icon_layer({
87-
{
88-
icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png",
89-
icon_size = 64,
90-
scale = 0.5,
91-
},
92-
}, 1, angelsmods.smelting.number_tint),
93-
},
94-
{
95-
name = "bob-tungsten-carbide-2",
75+
name = "tungsten-carbide",
9676
subgroup = "angels-tungsten-casting",
9777
energy_required = 6,
9878
ingredients = {
9979
{ type = "item", name = "bob-powdered-tungsten", amount = 10 },
10080
{ type = "item", name = "angels-solid-carbon", amount = 10 },
10181
},
10282
results = {
103-
{ type = "item", name = "bob-tungsten-carbide", amount = 20 },
83+
{ type = "item", name = "tungsten-carbide", amount = 20 },
10484
},
105-
order = "k[tungsten-carbide]-b",
106-
icons = angelsmods.functions.add_number_icon_layer({
107-
{
108-
icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png",
109-
icon_size = 64,
110-
scale = 0.5,
111-
},
112-
}, 2, angelsmods.smelting.number_tint),
85+
order = "k[tungsten-carbide]",
11386
},
11487
})
11588

@@ -143,8 +116,7 @@ end
143116
-------------------------------------------------------------------------------
144117
if mods["bobplates"] then
145118
local alloy_recipes = {
146-
"bob-tungsten-carbide",
147-
"bob-tungsten-carbide-2",
119+
"tungsten-carbide",
148120
"bob-copper-tungsten-alloy",
149121
}
150122

0 commit comments

Comments
 (0)