diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt index cbb30b2cb..e0439f22a 100644 --- a/angelsbioprocessing/changelog.txt +++ b/angelsbioprocessing/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.7.27 +Date: 21.02.2024 + Changes: + - Renamed triggers table from angelsmods.triggers to angelsmods.trigger to match other Angel's mods (969) +--------------------------------------------------------------------------------------------------- Version: 0.7.26 Date: 04.01.2024 Changes: diff --git a/angelsbioprocessing/data.lua b/angelsbioprocessing/data.lua index b998444c4..59ba022ab 100644 --- a/angelsbioprocessing/data.lua +++ b/angelsbioprocessing/data.lua @@ -4,66 +4,66 @@ angelsmods.bioprocessing = angelsmods.bioprocessing or {} angelsmods.bioprocessing.number_tint = { r = 0.2, g = 1, b = 0.2, a = 1 } --TRIGGER CHECKS -angelsmods.triggers = angelsmods.triggers or {} +angelsmods.trigger = angelsmods.trigger or {} +angelsmods.triggers = angelsmods.trigger --BIO TOKEN -angelsmods.triggers.lab_ignore_token = angelsmods.triggers.lab_ignore_token or {} -angelsmods.triggers.lab_ignore_token["lab-alien"] = true -angelsmods.triggers.lab_ignore_token["lab-module"] = true +angelsmods.trigger.lab_ignore_token = angelsmods.trigger.lab_ignore_token or {} +angelsmods.trigger.lab_ignore_token["lab-alien"] = true +angelsmods.trigger.lab_ignore_token["lab-module"] = true --ARTIFACTS -angelsmods.triggers.artifacts = angelsmods.triggers.artifacts or {} +angelsmods.trigger.artifacts = angelsmods.trigger.artifacts or {} if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then - angelsmods.triggers.artifacts["red"] = true - angelsmods.triggers.artifacts["yellow"] = true - angelsmods.triggers.artifacts["orange"] = true - angelsmods.triggers.artifacts["blue"] = true - angelsmods.triggers.artifacts["purple"] = true - angelsmods.triggers.artifacts["green"] = true - angelsmods.triggers.artifacts["base"] = true -- pink + angelsmods.trigger.artifacts["red"] = true + angelsmods.trigger.artifacts["yellow"] = true + angelsmods.trigger.artifacts["orange"] = true + angelsmods.trigger.artifacts["blue"] = true + angelsmods.trigger.artifacts["purple"] = true + angelsmods.trigger.artifacts["green"] = true + angelsmods.trigger.artifacts["base"] = true -- pink bobmods.enemies.small_alien_artifacts = true end --BIO PASTES -angelsmods.triggers.bio_pastes = angelsmods.triggers.bio_pastes or {} -angelsmods.triggers.bio_pastes["cellulose"] = true -- required for petri dish +angelsmods.trigger.bio_pastes = angelsmods.trigger.bio_pastes or {} +angelsmods.trigger.bio_pastes["cellulose"] = true -- required for petri dish if angelsmods.functions.is_special_vanilla() then else - if angelsmods.triggers.artifacts["red"] then - angelsmods.triggers.bio_pastes["copper"] = true + if angelsmods.trigger.artifacts["red"] then + angelsmods.trigger.bio_pastes["copper"] = true end - if angelsmods.triggers.artifacts["yellow"] then - angelsmods.triggers.bio_pastes["gold"] = true + if angelsmods.trigger.artifacts["yellow"] then + angelsmods.trigger.bio_pastes["gold"] = true end - if angelsmods.triggers.artifacts["orange"] then - angelsmods.triggers.bio_pastes["tungsten"] = true + if angelsmods.trigger.artifacts["orange"] then + angelsmods.trigger.bio_pastes["tungsten"] = true end - if angelsmods.triggers.artifacts["blue"] then - angelsmods.triggers.bio_pastes["cobalt"] = true + if angelsmods.trigger.artifacts["blue"] then + angelsmods.trigger.bio_pastes["cobalt"] = true end - if angelsmods.triggers.artifacts["purple"] then - angelsmods.triggers.bio_pastes["titanium"] = true + if angelsmods.trigger.artifacts["purple"] then + angelsmods.trigger.bio_pastes["titanium"] = true end - if angelsmods.triggers.artifacts["green"] then - angelsmods.triggers.bio_pastes["zinc"] = true + if angelsmods.trigger.artifacts["green"] then + angelsmods.trigger.bio_pastes["zinc"] = true end - if angelsmods.triggers.artifacts["base"] then - angelsmods.triggers.bio_pastes["iron"] = true + if angelsmods.trigger.artifacts["base"] then + angelsmods.trigger.bio_pastes["iron"] = true end - --angelsmods.triggers.bio_pastes["silver"] = true --unused + --angelsmods.trigger.bio_pastes["silver"] = true --unused end --BIO ALTERNATIVES FOR PETRO -angelsmods.triggers.bio_rubber = angelsmods.triggers.bio_rubber or angelsmods.trigger.rubber or false -angelsmods.triggers.bio_resin = angelsmods.triggers.bio_resin or angelsmods.trigger.resin or false -angelsmods.triggers.bio_plastic = angelsmods.triggers.bio_plastic - or (angelsmods.trigger.plastic and (angelsmods.triggers.bio_resin or angelsmods.triggers.bio_rubber)) +angelsmods.trigger.bio_rubber = angelsmods.trigger.bio_rubber or angelsmods.trigger.rubber or false +angelsmods.trigger.bio_resin = angelsmods.trigger.bio_resin or angelsmods.trigger.resin or false +angelsmods.trigger.bio_plastic = angelsmods.trigger.bio_plastic + or (angelsmods.trigger.plastic and (angelsmods.trigger.bio_resin or angelsmods.trigger.bio_rubber)) or false -angelsmods.triggers.paper = (not angelsmods.functions.is_special_vanilla()) - or (mods["bobelectronics"] and true or false) -if angelsmods.triggers.paper then +angelsmods.trigger.paper = (not angelsmods.functions.is_special_vanilla()) or (mods["bobelectronics"] and true or false) +if angelsmods.trigger.paper then angelsmods.trigger.water_red_waste = true angelsmods.trigger.early_chemical_furnace = true end -angelsmods.triggers.crystals_full = (not angelsmods.functions.is_special_vanilla()) +angelsmods.trigger.crystals_full = (not angelsmods.functions.is_special_vanilla()) or (mods["bobmodules"] and true or false) -- set triggers for other angel mods diff --git a/angelsbioprocessing/info.json b/angelsbioprocessing/info.json index d6005f9df..06a97b3cc 100644 --- a/angelsbioprocessing/info.json +++ b/angelsbioprocessing/info.json @@ -1,6 +1,6 @@ { "name": "angelsbioprocessing", - "version": "0.7.26", + "version": "0.7.27", "factorio_version": "1.1", "title": "Angel's Bioprocessing", "author": "Arch666Angel", @@ -10,8 +10,6 @@ "dependencies": [ "angelsrefining >= 0.12.1", "angelspetrochem >= 0.9.25", - "angelssmelting >= 0.6.17", - "? bobenemies >= 1.1.5", - "? boblibrary >= 1.2.0" + "angelssmelting >= 0.6.17" ] } diff --git a/angelsbioprocessing/prototypes/bio-processing-override.lua b/angelsbioprocessing/prototypes/bio-processing-override.lua index 70a090ca2..f17fae4de 100644 --- a/angelsbioprocessing/prototypes/bio-processing-override.lua +++ b/angelsbioprocessing/prototypes/bio-processing-override.lua @@ -10,7 +10,7 @@ require("prototypes.overrides.bio-processing-override-angel") -- body local OV = angelsmods.functions.OV -local lab_ignore = angelsmods.triggers.lab_ignore_token +local lab_ignore = angelsmods.trigger.lab_ignore_token --OVERRIDE FOR BASE require("prototypes.overrides.bio-processing-override-base-game") diff --git a/angelsbioprocessing/prototypes/bio-processing-triggers.lua b/angelsbioprocessing/prototypes/bio-processing-triggers.lua index 71e13558e..d68d3e858 100644 --- a/angelsbioprocessing/prototypes/bio-processing-triggers.lua +++ b/angelsbioprocessing/prototypes/bio-processing-triggers.lua @@ -1,6 +1,6 @@ -- set triggers for the other angels mods -if angelsmods.triggers.bio_pastes["cobalt"] then +if angelsmods.trigger.bio_pastes["cobalt"] then angelsmods.trigger.ores["cobalt"] = true if mods["bobores"] then bobmods.ores.cobalt.enabled = true @@ -8,37 +8,37 @@ if angelsmods.triggers.bio_pastes["cobalt"] then angelsmods.trigger.smelting_products["cobalt"].powder = true end -if angelsmods.triggers.bio_pastes["copper"] then +if angelsmods.trigger.bio_pastes["copper"] then angelsmods.trigger.ores["copper"] = true angelsmods.trigger.smelting_products["copper"].powder = true end -if angelsmods.triggers.bio_pastes["gold"] then +if angelsmods.trigger.bio_pastes["gold"] then angelsmods.trigger.ores["gold"] = true angelsmods.trigger.smelting_products["gold"].powder = true end -if angelsmods.triggers.bio_pastes["iron"] then +if angelsmods.trigger.bio_pastes["iron"] then angelsmods.trigger.ores["iron"] = true angelsmods.trigger.smelting_products["iron"].powder = true end -if angelsmods.triggers.bio_pastes["silver"] then +if angelsmods.trigger.bio_pastes["silver"] then angelsmods.trigger.ores["silver"] = true angelsmods.trigger.smelting_products["silver"].powder = true end -if angelsmods.triggers.bio_pastes["titanium"] then +if angelsmods.trigger.bio_pastes["titanium"] then angelsmods.trigger.ores["titanium"] = true angelsmods.trigger.smelting_products["titanium"].powder = true end -if angelsmods.triggers.bio_pastes["tungsten"] then +if angelsmods.trigger.bio_pastes["tungsten"] then angelsmods.trigger.ores["tungsten"] = true angelsmods.trigger.smelting_products["tungsten"].powder = true end -if angelsmods.triggers.bio_pastes["zinc"] then +if angelsmods.trigger.bio_pastes["zinc"] then angelsmods.trigger.ores["zinc"] = true angelsmods.trigger.smelting_products["zinc"].powder = true end diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua index 04666b9d5..e7c5e2a28 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua @@ -83,7 +83,7 @@ end -- Puffer nests cannot be created angelsmods.functions.add_flag("puffer-nest", "hidden") -if angelsmods.triggers.crystals_full == true then +if angelsmods.trigger.crystals_full == true then else OV.disable_recipe({ "crystal-full-harmonic", diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua index e1e0f2063..ce34fdc2e 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua @@ -1,6 +1,6 @@ local OV = angelsmods.functions.OV -if angelsmods.triggers.bio_rubber then +if angelsmods.trigger.bio_rubber then OV.remove_prereq("rubbers", "rubber") OV.add_prereq("rubbers", "automation-2") OV.add_prereq("rubber", "rubbers") @@ -25,7 +25,7 @@ else }) end -if angelsmods.triggers.bio_resin then +if angelsmods.trigger.bio_resin then OV.remove_prereq("resins", "resin-1") OV.add_prereq("resins", "basic-chemistry-3") OV.add_prereq("resin-1", "resins") @@ -52,7 +52,7 @@ else OV.remove_prereq("bio-wood-processing-2", "bio-farm-1") end -if angelsmods.triggers.bio_plastic then +if angelsmods.trigger.bio_plastic then OV.remove_prereq("plastics", "plastic-1") OV.add_prereq("plastics", "angels-advanced-chemistry-1") OV.add_prereq("plastic-1", "plastics") @@ -76,7 +76,7 @@ else }) end -if angelsmods.triggers.paper then +if angelsmods.trigger.paper then OV.add_unlock("sodium-processing-1", "solid-sodium-hypochlorite-decomposition") OV.remove_unlock("chlorine-processing-3", "solid-salt-separation") OV.add_unlock("sodium-processing-1", "solid-salt-separation") diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-artifacts.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-artifacts.lua index 58d145b28..6423c0176 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-artifacts.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-artifacts.lua @@ -5,8 +5,8 @@ local contais_artifact_creation = false ------------------------------------------------------------------------------- -- RED ARTIFACTS -------------------------------------------------------------- ------------------------------------------------------------------------------- -if angelsmods.triggers.artifacts["red"] then - if angelsmods.triggers.bio_pastes["copper"] then +if angelsmods.trigger.artifacts["red"] then + if angelsmods.trigger.bio_pastes["copper"] then contais_artifact_creation = true data:extend({ @@ -69,7 +69,7 @@ if angelsmods.triggers.artifacts["red"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-red"] then - if angelsmods.triggers.bio_pastes["copper"] or angelsmods.exploration then + if angelsmods.trigger.bio_pastes["copper"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-red", "bio-processing-alien-small", "a[red]") end angelsmods.functions.move_item("alien-artifact-red", "bio-processing-alien-large", "a[red]") @@ -153,8 +153,8 @@ end ------------------------------------------------------------------------------- -- YELLOW ARTIFACTS ----------------------------------------------------------- ------------------------------------------------------------------------------- -if angelsmods.triggers.artifacts["yellow"] then - if angelsmods.triggers.bio_pastes["gold"] then +if angelsmods.trigger.artifacts["yellow"] then + if angelsmods.trigger.bio_pastes["gold"] then contais_artifact_creation = true data:extend({ @@ -217,7 +217,7 @@ if angelsmods.triggers.artifacts["yellow"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-yellow"] then - if angelsmods.triggers.bio_pastes["gold"] or angelsmods.exploration then + if angelsmods.trigger.bio_pastes["gold"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-yellow", "bio-processing-alien-small", "b[yellow]") end angelsmods.functions.move_item("alien-artifact-yellow", "bio-processing-alien-large", "b[yellow]") @@ -301,8 +301,8 @@ end ------------------------------------------------------------------------------- -- ORANGE ARTIFACTS ----------------------------------------------------------- ------------------------------------------------------------------------------- -if angelsmods.triggers.artifacts["orange"] then - if angelsmods.triggers.bio_pastes["tungsten"] then +if angelsmods.trigger.artifacts["orange"] then + if angelsmods.trigger.bio_pastes["tungsten"] then contais_artifact_creation = true data:extend({ @@ -365,7 +365,7 @@ if angelsmods.triggers.artifacts["orange"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-orange"] then - if angelsmods.triggers.bio_pastes["tungsten"] or angelsmods.exploration then + if angelsmods.trigger.bio_pastes["tungsten"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-orange", "bio-processing-alien-small", "c[orange]") end angelsmods.functions.move_item("alien-artifact-orange", "bio-processing-alien-large", "c[orange]") @@ -449,8 +449,8 @@ end ------------------------------------------------------------------------------- -- BLUE ARTIFACTS ------------------------------------------------------------- ------------------------------------------------------------------------------- -if angelsmods.triggers.artifacts["blue"] then - if angelsmods.triggers.bio_pastes["cobalt"] then +if angelsmods.trigger.artifacts["blue"] then + if angelsmods.trigger.bio_pastes["cobalt"] then contais_artifact_creation = true data:extend({ @@ -513,7 +513,7 @@ if angelsmods.triggers.artifacts["blue"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then - if angelsmods.triggers.bio_pastes["cobalt"] or angelsmods.exploration then + if angelsmods.trigger.bio_pastes["cobalt"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-blue", "bio-processing-alien-small", "d[blue]") end angelsmods.functions.move_item("alien-artifact-blue", "bio-processing-alien-large", "d[blue]") @@ -597,8 +597,8 @@ end ------------------------------------------------------------------------------- -- PURPLE ARTIFACTS ----------------------------------------------------------- ------------------------------------------------------------------------------- -if angelsmods.triggers.artifacts["purple"] then - if angelsmods.triggers.bio_pastes["titanium"] then +if angelsmods.trigger.artifacts["purple"] then + if angelsmods.trigger.bio_pastes["titanium"] then contais_artifact_creation = true data:extend({ @@ -661,7 +661,7 @@ if angelsmods.triggers.artifacts["purple"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-purple"] then - if angelsmods.triggers.bio_pastes["titanium"] or angelsmods.exploration then + if angelsmods.trigger.bio_pastes["titanium"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-purple", "bio-processing-alien-small", "e[purple]") end angelsmods.functions.move_item("alien-artifact-purple", "bio-processing-alien-large", "e[purple]") @@ -745,8 +745,8 @@ end ------------------------------------------------------------------------------- -- GREEN ARTIFACTS ------------------------------------------------------------ ------------------------------------------------------------------------------- -if angelsmods.triggers.artifacts["green"] then - if angelsmods.triggers.bio_pastes["zinc"] then +if angelsmods.trigger.artifacts["green"] then + if angelsmods.trigger.bio_pastes["zinc"] then contais_artifact_creation = true data:extend({ @@ -809,7 +809,7 @@ if angelsmods.triggers.artifacts["green"] then end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-green"] then - if angelsmods.triggers.bio_pastes["zinc"] or angelsmods.exploration then + if angelsmods.trigger.bio_pastes["zinc"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact-green", "bio-processing-alien-small", "f[green]") end angelsmods.functions.move_item("alien-artifact-green", "bio-processing-alien-large", "f[green]") @@ -893,8 +893,8 @@ end ------------------------------------------------------------------------------- -- BASE ARTIFACTS (pink) ------------------------------------------------------ ------------------------------------------------------------------------------- -if angelsmods.triggers.artifacts["base"] then -- pink - if angelsmods.triggers.bio_pastes["iron"] then +if angelsmods.trigger.artifacts["base"] then -- pink + if angelsmods.trigger.bio_pastes["iron"] then contais_artifact_creation = true data:extend({ @@ -951,7 +951,7 @@ if angelsmods.triggers.artifacts["base"] then -- pink end if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then - if angelsmods.triggers.bio_pastes["iron"] or angelsmods.exploration then + if angelsmods.trigger.bio_pastes["iron"] or angelsmods.exploration then angelsmods.functions.move_item("small-alien-artifact", "bio-processing-alien-small", "g[base]") end angelsmods.functions.move_item("alien-artifact", "bio-processing-alien-large", "g[base]") diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-paste.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-paste.lua index 69d6575a1..f602d5068 100644 --- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-paste.lua +++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-paste.lua @@ -1,48 +1,48 @@ local OV = angelsmods.functions.OV -if angelsmods.triggers.bio_pastes["cobalt"] then +if angelsmods.trigger.bio_pastes["cobalt"] then else angelsmods.functions.add_flag("paste-cobalt", "hidden") OV.disable_recipe({ "paste-cobalt" }) end -if angelsmods.triggers.bio_pastes["copper"] then +if angelsmods.trigger.bio_pastes["copper"] then else angelsmods.functions.add_flag("paste-copper", "hidden") OV.disable_recipe({ "paste-copper" }) end -if angelsmods.triggers.bio_pastes["gold"] then +if angelsmods.trigger.bio_pastes["gold"] then else angelsmods.functions.add_flag("paste-gold", "hidden") OV.disable_recipe({ "paste-gold" }) end -if angelsmods.triggers.bio_pastes["iron"] then +if angelsmods.trigger.bio_pastes["iron"] then else angelsmods.functions.add_flag("paste-iron", "hidden") OV.disable_recipe({ "paste-iron" }) end -if angelsmods.triggers.bio_pastes["silver"] then +if angelsmods.trigger.bio_pastes["silver"] then else angelsmods.functions.add_flag("paste-silver", "hidden") OV.disable_recipe({ "paste-silver" }) end -if angelsmods.triggers.bio_pastes["titanium"] then +if angelsmods.trigger.bio_pastes["titanium"] then else angelsmods.functions.add_flag("paste-titanium", "hidden") OV.disable_recipe({ "paste-titanium" }) end -if angelsmods.triggers.bio_pastes["tungsten"] then +if angelsmods.trigger.bio_pastes["tungsten"] then else angelsmods.functions.add_flag("paste-tungsten", "hidden") OV.disable_recipe({ "paste-tungsten" }) end -if angelsmods.triggers.bio_pastes["zinc"] then +if angelsmods.trigger.bio_pastes["zinc"] then else angelsmods.functions.add_flag("paste-zinc", "hidden") OV.disable_recipe({ "paste-zinc" }) diff --git a/angelsbioprocessing/prototypes/tips-and-tricks/1-3-bio-animals/1-3-bio-animals-description.lua b/angelsbioprocessing/prototypes/tips-and-tricks/1-3-bio-animals/1-3-bio-animals-description.lua index 2a244c156..171d795e3 100644 --- a/angelsbioprocessing/prototypes/tips-and-tricks/1-3-bio-animals/1-3-bio-animals-description.lua +++ b/angelsbioprocessing/prototypes/tips-and-tricks/1-3-bio-animals/1-3-bio-animals-description.lua @@ -2,7 +2,7 @@ local description = { "", { "tips-and-tricks-description.angelsbioprocessing-animals" }, { "tips-and-tricks-description.animals-notes-fish" }, - angelsmods.triggers.artifacts["base"] and { "tips-and-tricks-sub.fish-artifacts" } or nil, + angelsmods.trigger.artifacts["base"] and { "tips-and-tricks-sub.fish-artifacts" } or nil, { "tips-and-tricks-description.animals-notes-puffers" }, { "tips-and-tricks-description.animals-notes-biters" }, } diff --git a/angelsexploration/changelog.txt b/angelsexploration/changelog.txt index 76a49265b..5b4f439ca 100644 --- a/angelsexploration/changelog.txt +++ b/angelsexploration/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.16 +Date: 21.02.2024 + Changes: + - Renamed triggers table from angelsmods.triggers to angelsmods.trigger to match other Angel's mods (969) +--------------------------------------------------------------------------------------------------- Version: 0.3.15 Date: 22.12.2023 Changes: diff --git a/angelsexploration/data.lua b/angelsexploration/data.lua index 4b2268c89..6317bb528 100644 --- a/angelsexploration/data.lua +++ b/angelsexploration/data.lua @@ -4,21 +4,21 @@ angelsmods.exploration = angelsmods.exploration or {} angelsmods.functions = angelsmods.functions or {} --TRIGGER CHECKS -angelsmods.triggers.artifacts["red"] = true -angelsmods.triggers.artifacts["yellow"] = true -angelsmods.triggers.artifacts["orange"] = true -angelsmods.triggers.artifacts["blue"] = true -angelsmods.triggers.artifacts["purple"] = true -angelsmods.triggers.artifacts["green"] = true -angelsmods.triggers.artifacts["base"] = true -- pink - ---angelsmods.triggers.bio_pastes["copper"] = true ---angelsmods.triggers.bio_pastes["gold"] = true ---angelsmods.triggers.bio_pastes["tungsten"] = true ---angelsmods.triggers.bio_pastes["cobalt"] = true ---angelsmods.triggers.bio_pastes["titanium"] = true ---angelsmods.triggers.bio_pastes["zinc"] = true ---angelsmods.triggers.bio_pastes["iron"] = true +angelsmods.trigger.artifacts["red"] = true +angelsmods.trigger.artifacts["yellow"] = true +angelsmods.trigger.artifacts["orange"] = true +angelsmods.trigger.artifacts["blue"] = true +angelsmods.trigger.artifacts["purple"] = true +angelsmods.trigger.artifacts["green"] = true +angelsmods.trigger.artifacts["base"] = true -- pink + +--angelsmods.trigger.bio_pastes["copper"] = true +--angelsmods.trigger.bio_pastes["gold"] = true +--angelsmods.trigger.bio_pastes["tungsten"] = true +--angelsmods.trigger.bio_pastes["cobalt"] = true +--angelsmods.trigger.bio_pastes["titanium"] = true +--angelsmods.trigger.bio_pastes["zinc"] = true +--angelsmods.trigger.bio_pastes["iron"] = true --angelsmods.trigger.smelting_products["iron"].powder = true diff --git a/angelsexploration/info.json b/angelsexploration/info.json index e6d9bdede..6b76ca47d 100644 --- a/angelsexploration/info.json +++ b/angelsexploration/info.json @@ -1,6 +1,6 @@ { "name": "angelsexploration", - "version": "0.3.15", + "version": "0.3.16", "factorio_version": "1.1", "title": "Angel's Exploration (BETA)", "author": "Arch666Angel", @@ -12,8 +12,6 @@ "angelspetrochem >= 0.9.21", "angelssmelting >= 0.6.18", "angelsbioprocessing >= 0.7.25", - "angelsindustries >= 0.4.15", - "? bobenemies >= 1.1.5", - "? bobwarfare >= 1.1.5" + "angelsindustries >= 0.4.15" ] } diff --git a/angelsexploration/prototypes/entities/biter-definitions.lua b/angelsexploration/prototypes/entities/biter-definitions.lua index cb73809f8..f6463a977 100644 --- a/angelsexploration/prototypes/entities/biter-definitions.lua +++ b/angelsexploration/prototypes/entities/biter-definitions.lua @@ -1,7 +1,7 @@ local bob_biters = mods["bobenemies"] and true or false local function create_loot_definition(color, avg_amount, variation) - if not angelsmods.triggers.artifacts[color] then + if not angelsmods.trigger.artifacts[color] then return nil end diff --git a/angelsexploration/prototypes/overrides/biter-updates.lua b/angelsexploration/prototypes/overrides/biter-updates.lua index 196c701a2..7135f906a 100644 --- a/angelsexploration/prototypes/overrides/biter-updates.lua +++ b/angelsexploration/prototypes/overrides/biter-updates.lua @@ -202,25 +202,25 @@ end --CONVERT LOOT local loot_to_be_converted = {} -if angelsmods.triggers.artifacts["base"] then +if angelsmods.trigger.artifacts["base"] then loot_to_be_converted["alien-artifact"] = { name = "small-alien-artifact", rate = 2 } end -if angelsmods.triggers.artifacts["red"] then +if angelsmods.trigger.artifacts["red"] then loot_to_be_converted["alien-artifact-red"] = { name = "small-alien-artifact-red", rate = 2 } end -if angelsmods.triggers.artifacts["yellow"] then +if angelsmods.trigger.artifacts["yellow"] then loot_to_be_converted["alien-artifact-yellow"] = { name = "small-alien-artifact-yellow", rate = 2 } end -if angelsmods.triggers.artifacts["orange"] then +if angelsmods.trigger.artifacts["orange"] then loot_to_be_converted["alien-artifact-orange"] = { name = "small-alien-artifact-orange", rate = 2 } end -if angelsmods.triggers.artifacts["blue"] then +if angelsmods.trigger.artifacts["blue"] then loot_to_be_converted["alien-artifact-blue"] = { name = "small-alien-artifact-blue", rate = 2 } end -if angelsmods.triggers.artifacts["purple"] then +if angelsmods.trigger.artifacts["purple"] then loot_to_be_converted["alien-artifact-purple"] = { name = "small-alien-artifact-purple", rate = 2 } end -if angelsmods.triggers.artifacts["green"] then +if angelsmods.trigger.artifacts["green"] then loot_to_be_converted["alien-artifact-green"] = { name = "small-alien-artifact-green", rate = 2 } end diff --git a/angelsexploration/prototypes/overrides/gathering-turret-updates.lua b/angelsexploration/prototypes/overrides/gathering-turret-updates.lua index 49d69ad49..62c18760b 100644 --- a/angelsexploration/prototypes/overrides/gathering-turret-updates.lua +++ b/angelsexploration/prototypes/overrides/gathering-turret-updates.lua @@ -58,13 +58,13 @@ if mods["bobenemies"] then end -- GATHERING TARGETS (can be added by other mods, this list can be extended) -if angelsmods.triggers.artifacts["base"] then +if angelsmods.trigger.artifacts["base"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact", require_tech_unlock = "angels-gathering-turret", }) end -if angelsmods.triggers.artifacts["red"] then +if angelsmods.trigger.artifacts["red"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-red", require_tech_unlock = true, @@ -74,7 +74,7 @@ if angelsmods.triggers.artifacts["red"] then }, }) end -if angelsmods.triggers.artifacts["yellow"] then +if angelsmods.trigger.artifacts["yellow"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-yellow", require_tech_unlock = true, @@ -84,7 +84,7 @@ if angelsmods.triggers.artifacts["yellow"] then }, }) end -if angelsmods.triggers.artifacts["orange"] then +if angelsmods.trigger.artifacts["orange"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-orange", require_tech_unlock = true, @@ -94,7 +94,7 @@ if angelsmods.triggers.artifacts["orange"] then }, }) end -if angelsmods.triggers.artifacts["blue"] then +if angelsmods.trigger.artifacts["blue"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-blue", require_tech_unlock = true, @@ -104,7 +104,7 @@ if angelsmods.triggers.artifacts["blue"] then }, }) end -if angelsmods.triggers.artifacts["purple"] then +if angelsmods.trigger.artifacts["purple"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-purple", require_tech_unlock = true, @@ -114,7 +114,7 @@ if angelsmods.triggers.artifacts["purple"] then }, }) end -if angelsmods.triggers.artifacts["green"] then +if angelsmods.trigger.artifacts["green"] then angelsmods.functions.create_gathering_turret_target({ name = "small-alien-artifact-green", require_tech_unlock = true, diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt index 71e66e4fa..1aee066f4 100644 --- a/angelsindustries/changelog.txt +++ b/angelsindustries/changelog.txt @@ -1,4 +1,12 @@ --------------------------------------------------------------------------------------------------- +Version: 0.4.21 +Date: 21.02.2024 + Changes: + - Renamed triggers table from angelsmods.triggers to angelsmods.trigger to match other Angel's mods (969) + Bugfixes: + - Science mode: + - Sodium Processing 1 tech now uses green analyzers rather than blue so Paper making 2 can be used (966) +--------------------------------------------------------------------------------------------------- Version: 0.4.20 Date: 04.01.2024 Changes: diff --git a/angelsindustries/info.json b/angelsindustries/info.json index 5120b78c1..ce768c039 100644 --- a/angelsindustries/info.json +++ b/angelsindustries/info.json @@ -1,6 +1,6 @@ { "name": "angelsindustries", - "version": "0.4.20", + "version": "0.4.21", "factorio_version": "1.1", "title": "Angel's Industries", "author": "Arch666Angel", @@ -12,10 +12,6 @@ "angelspetrochem >= 0.9.25", "angelssmelting >= 0.6.17", "angelsbioprocessing >= 0.7.21", - "(?) bobassembly >= 1.1.5", - "(?) boblogistics >= 1.1.5", - "(?) bobtech >= 1.1.5", - "(?) bobrevamp >= 1.1.5", "(?) aai-industry >= 0.4.12" ] } diff --git a/angelsindustries/prototypes/angels-industries-triggers.lua b/angelsindustries/prototypes/angels-industries-triggers.lua index f411af31f..4f0135e74 100644 --- a/angelsindustries/prototypes/angels-industries-triggers.lua +++ b/angelsindustries/prototypes/angels-industries-triggers.lua @@ -68,7 +68,7 @@ if angelsmods.industries.components then angelsmods.trigger.early_sintering_oven = true --BIOPROCESSING TRIGGERS - angelsmods.triggers.bio_plastic = true - angelsmods.triggers.bio_resin = true - angelsmods.triggers.bio_rubber = true + angelsmods.trigger.bio_plastic = true + angelsmods.trigger.bio_resin = true + angelsmods.trigger.bio_rubber = true end diff --git a/angelsindustries/prototypes/buildings/angels-labs-basic.lua b/angelsindustries/prototypes/buildings/angels-labs-basic.lua index f813b6f1a..bf9a2fe7f 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-basic.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-basic.lua @@ -274,7 +274,7 @@ if angelsmods.industries.tech then }, }) - angelsmods.triggers.lab_ignore_token["angels-basic-lab"] = true - angelsmods.triggers.lab_ignore_token["angels-basic-lab-2"] = true - angelsmods.triggers.lab_ignore_token["angels-basic-lab-3"] = true + angelsmods.trigger.lab_ignore_token["angels-basic-lab"] = true + angelsmods.trigger.lab_ignore_token["angels-basic-lab-2"] = true + angelsmods.trigger.lab_ignore_token["angels-basic-lab-3"] = true end diff --git a/angelsindustries/prototypes/buildings/angels-labs-energy.lua b/angelsindustries/prototypes/buildings/angels-labs-energy.lua index bc76baf9f..7f1fca234 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-energy.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-energy.lua @@ -258,7 +258,7 @@ if angelsmods.industries.tech then }, }) - angelsmods.triggers.lab_ignore_token["angels-energy-lab-1"] = true - angelsmods.triggers.lab_ignore_token["angels-energy-lab-2"] = true - angelsmods.triggers.lab_ignore_token["angels-energy-lab-3"] = true + angelsmods.trigger.lab_ignore_token["angels-energy-lab-1"] = true + angelsmods.trigger.lab_ignore_token["angels-energy-lab-2"] = true + angelsmods.trigger.lab_ignore_token["angels-energy-lab-3"] = true end diff --git a/angelsindustries/prototypes/buildings/angels-labs-enhance.lua b/angelsindustries/prototypes/buildings/angels-labs-enhance.lua index 1276ff405..7150de505 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-enhance.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-enhance.lua @@ -262,7 +262,7 @@ if angelsmods.industries.tech then }, }) - --angelsmods.triggers.lab_ignore_token["angels-enhance-lab-1"] = true - --angelsmods.triggers.lab_ignore_token["angels-enhance-lab-2"] = true - angelsmods.triggers.lab_ignore_token["angels-enhance-lab-3"] = true + --angelsmods.trigger.lab_ignore_token["angels-enhance-lab-1"] = true + --angelsmods.trigger.lab_ignore_token["angels-enhance-lab-2"] = true + angelsmods.trigger.lab_ignore_token["angels-enhance-lab-3"] = true end diff --git a/angelsindustries/prototypes/buildings/angels-labs-exploration.lua b/angelsindustries/prototypes/buildings/angels-labs-exploration.lua index e090c37ef..cfcb6d705 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-exploration.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-exploration.lua @@ -261,7 +261,7 @@ if angelsmods.industries.tech then }, }) - -- angelsmods.triggers.lab_ignore_token["angels-exploration-lab-1"] = true - -- angelsmods.triggers.lab_ignore_token["angels-exploration-lab-2"] = true - angelsmods.triggers.lab_ignore_token["angels-exploration-lab-3"] = true + -- angelsmods.trigger.lab_ignore_token["angels-exploration-lab-1"] = true + -- angelsmods.trigger.lab_ignore_token["angels-exploration-lab-2"] = true + angelsmods.trigger.lab_ignore_token["angels-exploration-lab-3"] = true end diff --git a/angelsindustries/prototypes/buildings/angels-labs-logistic.lua b/angelsindustries/prototypes/buildings/angels-labs-logistic.lua index 25c7a0272..018459fa5 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-logistic.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-logistic.lua @@ -258,7 +258,7 @@ if angelsmods.industries.tech then }, }) - angelsmods.triggers.lab_ignore_token["angels-logistic-lab-1"] = true - angelsmods.triggers.lab_ignore_token["angels-logistic-lab-2"] = true - angelsmods.triggers.lab_ignore_token["angels-logistic-lab-3"] = true + angelsmods.trigger.lab_ignore_token["angels-logistic-lab-1"] = true + angelsmods.trigger.lab_ignore_token["angels-logistic-lab-2"] = true + angelsmods.trigger.lab_ignore_token["angels-logistic-lab-3"] = true end diff --git a/angelsindustries/prototypes/buildings/angels-labs-main.lua b/angelsindustries/prototypes/buildings/angels-labs-main.lua index 1140fa4ec..efee9063c 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-main.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-main.lua @@ -192,7 +192,7 @@ if angelsmods.industries.tech then lab_entity_tier, }) - angelsmods.triggers.lab_ignore_token[lab_entity_tier.name] = true + angelsmods.trigger.lab_ignore_token[lab_entity_tier.name] = true end -- disable base game lab as it is obsolete @@ -468,5 +468,5 @@ if angelsmods.industries.tech then }, }) - angelsmods.triggers.lab_ignore_token[lab_item.name .. string.format("-%i", 0)] = true + angelsmods.trigger.lab_ignore_token[lab_item.name .. string.format("-%i", 0)] = true end diff --git a/angelsindustries/prototypes/buildings/angels-labs-processing.lua b/angelsindustries/prototypes/buildings/angels-labs-processing.lua index eba541ff8..896a6d11a 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-processing.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-processing.lua @@ -266,5 +266,5 @@ if angelsmods.industries.tech then }, }) - angelsmods.triggers.lab_ignore_token["angels-processing-lab-3"] = true + angelsmods.trigger.lab_ignore_token["angels-processing-lab-3"] = true end diff --git a/angelsindustries/prototypes/buildings/angels-labs-war.lua b/angelsindustries/prototypes/buildings/angels-labs-war.lua index d0dee0c25..fd45db251 100644 --- a/angelsindustries/prototypes/buildings/angels-labs-war.lua +++ b/angelsindustries/prototypes/buildings/angels-labs-war.lua @@ -258,7 +258,7 @@ if angelsmods.industries.tech then }, }) - angelsmods.triggers.lab_ignore_token["angels-war-lab-1"] = true - angelsmods.triggers.lab_ignore_token["angels-war-lab-2"] = true - angelsmods.triggers.lab_ignore_token["angels-war-lab-3"] = true + angelsmods.trigger.lab_ignore_token["angels-war-lab-1"] = true + angelsmods.trigger.lab_ignore_token["angels-war-lab-2"] = true + angelsmods.trigger.lab_ignore_token["angels-war-lab-3"] = true end diff --git a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua index df3a3102f..a1861ed42 100644 --- a/angelsindustries/prototypes/overrides/global-tech-base-packs.lua +++ b/angelsindustries/prototypes/overrides/global-tech-base-packs.lua @@ -74,6 +74,8 @@ if angelsmods.industries.tech then -- BASE GAME AI.pack_replace("advanced-material-processing", "red", "green") --move advanced material processing up a tier AI.pack_replace("lubricant", "blue", "green") + -- PETROCHEM + AI.pack_replace("sodium-processing-1", "blue", "green") -- BIO PROCESSING OV.add_prereq("bio-refugium-fish-1", "water-treatment-2") AI.pack_replace("bio-paper-2", "blue", "green") diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt index d0c7fb03e..2741948d2 100644 --- a/angelspetrochem/changelog.txt +++ b/angelspetrochem/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.26 +Date: 21.02.2024 + Changes: + - Removed dependencies that are no longer relevant (975) +--------------------------------------------------------------------------------------------------- Version: 0.9.25 Date: 22.12.2023 Changes: diff --git a/angelspetrochem/info.json b/angelspetrochem/info.json index 4c205b40a..843c9265b 100644 --- a/angelspetrochem/info.json +++ b/angelspetrochem/info.json @@ -1,6 +1,6 @@ { "name": "angelspetrochem", - "version": "0.9.25", + "version": "0.9.26", "factorio_version": "1.1", "title": "Angel's Petrochemical Processing", "author": "Arch666Angel", @@ -8,10 +8,6 @@ "homepage": "https://forums.factorio.com/viewforum.php?f=185", "description": "Angel's Petrochemical processing changes Oil processing and adds Gas processing, as well as a more complex web of chemical production. Includes overrides and tie-ins to Bob's technologies and recipes. Dependencies: Angel's Refining", "dependencies": [ - "angelsrefining >= 0.12.3", - "? bobplates >= 1.1.6", - "? bobassembly >= 1.1.5", - "? bobrevamp >= 1.1.5", - "? bobelectronics >= 1.1.6" + "angelsrefining >= 0.12.3" ] } diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt index 5830d184c..19aeaea74 100644 --- a/angelsrefining/changelog.txt +++ b/angelsrefining/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 0.12.7 +Date: 21.02.2024 + Changes: + - Changed library function to handle bad input data (968) + Bugfixes: + - Added dependencies on more of Bob's mods to fix issue where Bob's techs were not being correctly replaced (975) +--------------------------------------------------------------------------------------------------- Version: 0.12.6 Date: 04.01.2024 Bugfixes: diff --git a/angelsrefining/data.lua b/angelsrefining/data.lua index 3956136ea..4cfafb94a 100644 --- a/angelsrefining/data.lua +++ b/angelsrefining/data.lua @@ -33,6 +33,7 @@ angelsmods.functions.TNT = require("prototypes.tips-and-tricks-functions") --TRIGGER CHECKS angelsmods.trigger = angelsmods.trigger or {} +angelsmods.trigger.refinery_products = {} angelsmods.trigger.enable_hq_graphics = mods["reskins-angels"] and true or settings.startup["angels-hq-graphics"].value local aeab = settings.startup["angels-enable-auto-barreling"].value angelsmods.trigger.enable_auto_barreling = (aeab == "Enabled+Hidden" or aeab == "Enabled+Shown") and true or false diff --git a/angelsrefining/info.json b/angelsrefining/info.json index cdd492475..ca2e652e1 100644 --- a/angelsrefining/info.json +++ b/angelsrefining/info.json @@ -1,6 +1,6 @@ { "name": "angelsrefining", - "version": "0.12.6", + "version": "0.12.7", "factorio_version": "1.1", "title": "Angel's Refining", "author": "Arch666Angel", @@ -9,12 +9,18 @@ "description": "Adds ore refining to the game. Compound ores have to be refined before you are able to smelt and cast them into plates. Works best (has more functionality) in conjunction with Angel's industries and/or Bob's mods and supports additional mods like Yuoki Industries.", "dependencies": [ "base >= 1.1.51", - "? bobplates >= 1.1.6", - "? bobrevamp >= 1.1.5", + "(?) bobassembly >= 1.1.5", + "? bobelectronics >= 1.1.6", + "? bobenemies >= 1.1.5", + "? boblibrary >= 1.2.0", + "(?) boblogistics >= 1.1.5", "(?) bobmodules", - "(?) boblogistics", + "? bobplates >= 1.1.6", "(?) bobpower", - "(?) bobelectronics", + "? bobrevamp >= 1.1.5", + "(?) bobtech >= 1.1.5", + "(?) bobvehicleequipment", + "? bobwarfare >= 1.1.5", "? rso-mod >= 2.3.3", "? Yuoki >= 0.4.0", "? UraniumPower >= 0.6.4", diff --git a/angelsrefining/prototypes/override-functions.lua b/angelsrefining/prototypes/override-functions.lua index 7fdec33e3..7241a7bb8 100644 --- a/angelsrefining/prototypes/override-functions.lua +++ b/angelsrefining/prototypes/override-functions.lua @@ -969,24 +969,26 @@ local function adjust_technology(tech, k) -- check a tech for basic adjustments end for i = #tech.unit.ingredients, 1, -1 do local pack = tech.unit.ingredients[i] - local nk = pack.name and "name" or 1 - local ak = pack.name and "amount" or 2 - if to_remove[pack[nk]] then - table.remove(tech.unit.ingredients, i) - else - if substitution_table.science_packs[pack[nk]] then - pack[ak] = substitution_table.science_packs[pack[nk]].amount - pack[nk] = substitution_table.science_packs[pack[nk]].add - end - if modifications and modifications[pack[nk]] then - if modifications[pack[nk]] > 0 then - dup_table[pack[nk]] = true - pack[ak] = modifications[pack[nk]] + if pack then + local nk = pack.name and "name" or 1 + local ak = pack.name and "amount" or 2 + if to_remove[pack[nk]] then + table.remove(tech.unit.ingredients, i) + else + if substitution_table.science_packs[pack[nk]] then + pack[ak] = substitution_table.science_packs[pack[nk]].amount + pack[nk] = substitution_table.science_packs[pack[nk]].add + end + if modifications and modifications[pack[nk]] then + if modifications[pack[nk]] > 0 then + dup_table[pack[nk]] = true + pack[ak] = modifications[pack[nk]] + else + table.remove(tech.unit.ingredients, i) + end else - table.remove(tech.unit.ingredients, i) + dup_table[pack[nk]] = true end - else - dup_table[pack[nk]] = true end end end diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index 6a834d31c..4b75a232b 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.6.23 +Date: 21.02.2024 + Changes: + - Steel casting does not need to force enable all iron ore products +--------------------------------------------------------------------------------------------------- Version: 0.6.22 Date: 22.12.2023 Changes: diff --git a/angelssmelting/data-updates.lua b/angelssmelting/data-updates.lua index 1985c387c..db270a13d 100644 --- a/angelssmelting/data-updates.lua +++ b/angelssmelting/data-updates.lua @@ -53,14 +53,6 @@ if angelsmods.trigger.smelting_products["steel"].rod then end if angelsmods.trigger.smelting_products["steel"].plate then angelsmods.trigger.smelting_products["steel"].ingot = true - if not angelsmods.functions.is_special_vanilla() then - angelsmods.trigger.smelting_products["silicon"].ingot = true - angelsmods.trigger.smelting_products["manganese"].ingot = true - angelsmods.trigger.smelting_products["cobalt"].ingot = true - angelsmods.trigger.smelting_products["nickel"].ingot = true - angelsmods.trigger.smelting_products["chrome"].ingot = true - angelsmods.trigger.smelting_products["tungsten"].powder = true - end end if angelsmods.trigger.smelting_products["steel"].powder then angelsmods.trigger.smelting_products["steel"].ingot = true @@ -142,13 +134,6 @@ if angelsmods.trigger.smelting_products["iron"].rod then end if angelsmods.trigger.smelting_products["iron"].plate then angelsmods.trigger.smelting_products["iron"].ingot = true - if not angelsmods.functions.is_special_vanilla() then - angelsmods.trigger.smelting_products["manganese"].ingot = true - angelsmods.trigger.smelting_products["silicon"].ingot = true - angelsmods.trigger.smelting_products["cobalt"].ingot = true - angelsmods.trigger.smelting_products["nickel"].ingot = true - angelsmods.trigger.smelting_products["chrome"].ingot = true - end end --lead if angelsmods.trigger.smelting_products["lead"].powder then diff --git a/angelssmelting/info.json b/angelssmelting/info.json index 3443f165d..5c18d6512 100644 --- a/angelssmelting/info.json +++ b/angelssmelting/info.json @@ -1,6 +1,6 @@ { "name": "angelssmelting", - "version": "0.6.22", + "version": "0.6.23", "factorio_version": "1.1", "title": "Angel's Smelting", "author": "Arch666Angel", @@ -9,7 +9,6 @@ "description": "Angel's Smelting provides alternative ways to produce plate and increase ore yield at the expense of space and energy.", "dependencies": [ "angelsrefining >= 0.12.1", - "angelspetrochem >= 0.9.25", - "? bobplates >= 1.1.6" + "angelspetrochem >= 0.9.25" ] }