Skip to content

Rework angel artifacts #1185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
LenardHess wants to merge 6 commits into
base: dev2.0
Choose a base branch
from
Draft

Rework angel artifacts #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c21e26
Fix build script missing execute permissions
LenardHess Oct 24, 2025
47c0a26
Fix alien artifact researches from biter loot drops
LenardHess Nov 17, 2025
a9ce123
Change alien loot researches to use research trigger function
LenardHess Nov 17, 2025
f1adc2f
Switch artifact researches to scripted triggers
LenardHess Nov 17, 2025
c89ad95
Add new graphics for alien artifact techs
LenardHess Nov 17, 2025
5f26632
Fix artifact name selection
LenardHess Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions angelsbioprocessing/control.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ script.on_event(defines.events.on_entity_died, function(event)
if (not killing_force) or loot.is_empty() then
return
end
loot = loot.get_contents()
for loot_item_name, loot_technology_to_research in pairs({
["angels-small-alien-artifact"] = "angels-alien-artifact",
["angels-small-alien-artifact-red"] = "angels-alien-artifact-red",
Expand All @@ -14,10 +13,11 @@ script.on_event(defines.events.on_entity_died, function(event)
["angels-small-alien-artifact-purple"] = "angels-alien-artifact-purple",
["angels-small-alien-artifact-green"] = "angels-alien-artifact-green",
}) do
if loot[loot_item_name] then
local technology = killing_force.technologies[loot_technology_to_research]
if technology then
technology.researched = true
if loot.find_item_stack(loot_item_name) then
if killing_force.technologies[loot_technology_to_research] then
-- Using this trigger function takes care of checking tech prerequisites.
-- It also will show the "Technology researched" chat message.
killing_force.script_trigger_research(loot_technology_to_research)
end
end
end
Expand Down
28 changes: 14 additions & 14 deletions angelsbioprocessing/prototypes/overrides/bio-processing-override-artifacts.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ local OV = angelsmods.functions.OV

local contains_artifact_creation = false
local artifact = {
["reg"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-alien-artifact" or "angels-alien-artifact",
["small-reg"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-small-alien-artifact" or "angels-small-alien-artifact",
["red"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-alien-artifact-red" or "angels-alien-artifact-red",
["small-red"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-small-alien-artifact-red" or "angels-small-alien-artifact-red",
["yellow"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-alien-artifact-yellow" or "angels-alien-artifact-yellow",
["small-yellow"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-small-alien-artifact-yellow" or "angels-small-alien-artifact-yellow",
["orange"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-alien-artifact-orange" or "angels-alien-artifact-orange",
["small-orange"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-small-alien-artifact-orange" or "angels-small-alien-artifact-orange",
["green"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-alien-artifact-green" or "angels-alien-artifact-green",
["small-green"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-small-alien-artifact-green" or "angels-small-alien-artifact-green",
["blue"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-alien-artifact-blue" or "angels-alien-artifact-blue",
["small-blue"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-small-alien-artifact-blue" or "angels-small-alien-artifact-blue",
["purple"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-alien-artifact-purple" or "angels-alien-artifact-purple",
["small-purple"] = (bobmods and bobmods.plates and bobmods.enemies) and "bob-small-alien-artifact-purple" or "angels-small-alien-artifact-purple",
["reg"] = (bobmods and bobmods.enemies and data.raw.item["bob-alien-artifact"]) and "bob-alien-artifact" or "angels-alien-artifact",
["small-reg"] = (bobmods and bobmods.enemies and data.raw.item["bob-small-alien-artifact"]) and "bob-small-alien-artifact" or "angels-small-alien-artifact",
["red"] = (bobmods and bobmods.enemies and data.raw.item["bob-alien-artifact-red"]) and "bob-alien-artifact-red" or "angels-alien-artifact-red",
["small-red"] = (bobmods and bobmods.enemies and data.raw.item["bob-small-alien-artifact-red"]) and "bob-small-alien-artifact-red" or "angels-small-alien-artifact-red",
["yellow"] = (bobmods and bobmods.enemies and data.raw.item["bob-alien-artifact-yellow"]) and "bob-alien-artifact-yellow" or "angels-alien-artifact-yellow",
["small-yellow"] = (bobmods and bobmods.enemies and data.raw.item["bob-small-alien-artifact-yellow"]) and "bob-small-alien-artifact-yellow" or "angels-small-alien-artifact-yellow",
["orange"] = (bobmods and bobmods.enemies and data.raw.item["bob-alien-artifact-orange"]) and "bob-alien-artifact-orange" or "angels-alien-artifact-orange",
["small-orange"] = (bobmods and bobmods.enemies and data.raw.item["bob-small-alien-artifact-orange"]) and "bob-small-alien-artifact-orange" or "angels-small-alien-artifact-orange",
["green"] = (bobmods and bobmods.enemies and data.raw.item["bob-alien-artifact-green"]) and "bob-alien-artifact-green" or "angels-alien-artifact-green",
["small-green"] = (bobmods and bobmods.enemies and data.raw.item["bob-small-alien-artifact-green"]) and "bob-small-alien-artifact-green" or "angels-small-alien-artifact-green",
["blue"] = (bobmods and bobmods.enemies and data.raw.item["bob-alien-artifact-blue"]) and "bob-alien-artifact-blue" or "angels-alien-artifact-blue",
["small-blue"] = (bobmods and bobmods.enemies and data.raw.item["bob-small-alien-artifact-blue"]) and "bob-small-alien-artifact-blue" or "angels-small-alien-artifact-blue",
["purple"] = (bobmods and bobmods.enemies and data.raw.item["bob-alien-artifact-purple"]) and "bob-alien-artifact-purple" or "angels-alien-artifact-purple",
["small-purple"] = (bobmods and bobmods.enemies and data.raw.item["bob-small-alien-artifact-purple"]) and "bob-small-alien-artifact-purple" or "angels-small-alien-artifact-purple",
}
-------------------------------------------------------------------------------
-- RED ARTIFACTS --------------------------------------------------------------
Expand Down
189 changes: 50 additions & 139 deletions angelsbioprocessing/prototypes/technology/bio-processing-artifacts.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,11 @@
-------------------------------------------------------------------------------
-- RED ARTIFACTS --------------------------------------------------------------
-------------------------------------------------------------------------------
{
type = "tool",
name = "angels-alien-artifact-red-tool",
localised_name = { "item-name.angels-small-alien-artifact-red" },
localised_description = { "item-description.angels-alien-artifact-tool" },
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-red-small.png",
icon_size = 32,
hidden = true,
stack_size = 1,
durability = 1,
order = "zzz",
},
{
type = "technology",
name = "angels-alien-artifact-red",
localised_name = { "item-name.angels-alien-artifact-red" },
icon = "__angelsbioprocessinggraphics__/graphics/technology/paste.png",
icon = "__angelsbioprocessinggraphics__/graphics/technology/alien-artifact-red.png",
icon_size = 128,
order = "c-a",
prerequisites = {
Expand All @@ -37,34 +25,22 @@
recipe = "angels-alien-artifact-red-from-basic",
},]]
},
unit = {
count = 50,
ingredients = {
{ "chemical-science-pack", 1 }, --{ "angels-alien-artifact-red-tool", 1 },
},
time = 30,
},
research_trigger = {
type = "scripted",
trigger_description = "Locate this artifact in your fight against the biters!",
Copy link
Collaborator

@KiwiHawk KiwiHawk Nov 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strings should be in the locale files. Makes them possible to translate

Copy link
Author

@LenardHess LenardHess Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will move, wasn't specifically aware of that 👍

icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-red.png",
icon_size = 32,
}

},
-------------------------------------------------------------------------------
-- YELLOW ARTIFACTS -----------------------------------------------------------
-------------------------------------------------------------------------------
{
type = "tool",
name = "angels-alien-artifact-yellow-tool",
localised_name = { "item-name.angels-small-alien-artifact-yellow" },
localised_description = { "item-description.angels-alien-artifact-tool" },
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-yellow-small.png",
icon_size = 32,
hidden = true,
stack_size = 1,
durability = 1,
order = "zzz",
},
{
type = "technology",
name = "angels-alien-artifact-yellow",
localised_name = { "item-name.angels-alien-artifact-yellow" },
icon = "__angelsbioprocessinggraphics__/graphics/technology/paste.png",
icon = "__angelsbioprocessinggraphics__/graphics/technology/alien-artifact-yellow.png",
icon_size = 128,
order = "c-a",
prerequisites = {
Expand All @@ -81,34 +57,21 @@
recipe = "angels-alien-artifact-yellow-from-basic",
},]]
},
unit = {
count = 50,
ingredients = {
{ "chemical-science-pack", 1 }, --{ "angels-alien-artifact-yellow-tool", 1 },
},
time = 30,
},
research_trigger = {
type = "scripted",
trigger_description = "Locate this artifact in your fight against the biters!",
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-yellow.png",
icon_size = 32,
}
},
-------------------------------------------------------------------------------
-- ORANGE ARTIFACTS -----------------------------------------------------------
-------------------------------------------------------------------------------
{
type = "tool",
name = "angels-alien-artifact-orange-tool",
localised_name = { "item-name.angels-small-alien-artifact-orange" },
localised_description = { "item-description.angels-alien-artifact-tool" },
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-orange-small.png",
icon_size = 32,
hidden = true,
stack_size = 1,
durability = 1,
order = "zzz",
},
{
type = "technology",
name = "angels-alien-artifact-orange",
localised_name = { "item-name.angels-alien-artifact-orange" },
icon = "__angelsbioprocessinggraphics__/graphics/technology/paste.png",
icon = "__angelsbioprocessinggraphics__/graphics/technology/alien-artifact-orange.png",
icon_size = 128,
order = "c-a",
prerequisites = {
Expand All @@ -124,34 +87,21 @@
recipe = "angels-alien-artifact-orange-from-basic",
},]]
},
unit = {
count = 50,
ingredients = {
{ "chemical-science-pack", 1 }, --{ "angels-alien-artifact-orange-tool", 1 },
},
time = 30,
},
research_trigger = {
type = "scripted",
trigger_description = "Locate this artifact in your fight against the biters!",
Copy link
Collaborator

@KiwiHawk KiwiHawk Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also means it won't be repeated

Copy link
Author

@LenardHess LenardHess Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might also be nice to have a per-color text to hint at where this drops from 🤔

icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-orange.png",
icon_size = 32,
}
},
-------------------------------------------------------------------------------
-- BLUE ARTIFACTS -------------------------------------------------------------
-------------------------------------------------------------------------------
{
type = "tool",
name = "angels-alien-artifact-blue-tool",
localised_name = { "item-name.angels-small-alien-artifact-blue" },
localised_description = { "item-description.angels-alien-artifact-tool" },
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-blue-small.png",
icon_size = 32,
hidden = true,
stack_size = 1,
durability = 1,
order = "zzz",
},
{
type = "technology",
name = "angels-alien-artifact-blue",
localised_name = { "item-name.angels-alien-artifact-blue" },
icon = "__angelsbioprocessinggraphics__/graphics/technology/paste.png",
icon = "__angelsbioprocessinggraphics__/graphics/technology/alien-artifact-blue.png",
icon_size = 128,
order = "c-a",
prerequisites = {
Expand All @@ -167,34 +117,21 @@
recipe = "angels-alien-artifact-blue-from-basic",
},]]
},
unit = {
count = 50,
ingredients = {
{ "chemical-science-pack", 1 }, --{ "angels-alien-artifact-blue-tool", 1 },
},
time = 30,
},
research_trigger = {
type = "scripted",
trigger_description = "Locate this artifact in your fight against the biters!",
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-blue.png",
icon_size = 32,
}
},
-------------------------------------------------------------------------------
-- PURPLE ARTIFACTS -----------------------------------------------------------
-------------------------------------------------------------------------------
{
type = "tool",
name = "angels-alien-artifact-purple-tool",
localised_name = { "item-name.angels-small-alien-artifact-purple" },
localised_description = { "item-description.angels-alien-artifact-tool" },
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-purple-small.png",
icon_size = 32,
hidden = true,
stack_size = 1,
durability = 1,
order = "zzz",
},
{
type = "technology",
name = "angels-alien-artifact-purple",
localised_name = { "item-name.angels-alien-artifact-purple" },
icon = "__angelsbioprocessinggraphics__/graphics/technology/paste.png",
icon = "__angelsbioprocessinggraphics__/graphics/technology/alien-artifact-purple.png",
icon_size = 128,
order = "c-a",
prerequisites = {
Expand All @@ -211,34 +148,21 @@
recipe = "angels-alien-artifact-purple-from-basic",
},]]
},
unit = {
count = 50,
ingredients = {
{ "chemical-science-pack", 1 }, --{ "angels-alien-artifact-purple-tool", 1 },
},
time = 30,
},
research_trigger = {
type = "scripted",
trigger_description = "Locate this artifact in your fight against the biters!",
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-purple.png",
icon_size = 32,
}
},
-------------------------------------------------------------------------------
-- GREEN ARTIFACTS ------------------------------------------------------------
-------------------------------------------------------------------------------
{
type = "tool",
name = "angels-alien-artifact-green-tool",
localised_name = { "item-name.angels-small-alien-artifact-green" },
localised_description = { "item-description.alien-artifact-tool" },
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-green-small.png",
icon_size = 32,
hidden = true,
stack_size = 1,
durability = 1,
order = "zzz",
},
{
type = "technology",
name = "angels-alien-artifact-green",
localised_name = { "item-name.angels-alien-artifact-green" },
icon = "__angelsbioprocessinggraphics__/graphics/technology/paste.png",
icon = "__angelsbioprocessinggraphics__/graphics/technology/alien-artifact-green.png",
icon_size = 128,
order = "c-a",
prerequisites = {
Expand All @@ -255,33 +179,21 @@
recipe = "angels-alien-artifact-green-from-basic",
},]]
},
unit = {
count = 50,
ingredients = {
{ "chemical-science-pack", 1 }, --{ "angels-alien-artifact-green-tool", 1 },
},
time = 30,
},
research_trigger = {
type = "scripted",
trigger_description = "Locate this artifact in your fight against the biters!",
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-green.png",
icon_size = 32,
}
},
-------------------------------------------------------------------------------
-- BASE ARTIFACTS (pink) ------------------------------------------------------
-------------------------------------------------------------------------------
{
type = "tool",
name = "angels-alien-artifact-tool",
localised_name = { "item-name.angels-small-alien-artifact" },
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact-small.png",
icon_size = 32,
hidden = true,
stack_size = 1,
durability = 1,
order = "zzz",
},
{
type = "technology",
name = "angels-alien-artifact",
localised_name = { "item-name.angels-alien-artifact" },
icon = "__angelsbioprocessinggraphics__/graphics/technology/paste.png",
icon = "__angelsbioprocessinggraphics__/graphics/technology/alien-artifact.png",
icon_size = 128,
order = "c-a",
prerequisites = {},
Expand All @@ -291,13 +203,12 @@
recipe = "angels-alien-artifact-from-small",
},]]
},
unit = {
count = 50,
ingredients = {
{ "chemical-science-pack", 1 }, --alien-artifact-tool not recognised in lab
},
time = 30,
},
research_trigger = {
type = "scripted",
trigger_description = "Locate this artifact in your fight against the biters!",
icon = "__angelsbioprocessinggraphics__/graphics/icons/alien-artifact.png",
icon_size = 32,
}
},
})
--end
Binary file added angelsbioprocessinggraphics/graphics/technology/alien-artifact-blue.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added angelsbioprocessinggraphics/graphics/technology/alien-artifact-green.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added angelsbioprocessinggraphics/graphics/technology/alien-artifact-orange.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added angelsbioprocessinggraphics/graphics/technology/alien-artifact-purple.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added angelsbioprocessinggraphics/graphics/technology/alien-artifact-red.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added angelsbioprocessinggraphics/graphics/technology/alien-artifact-yellow.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added angelsbioprocessinggraphics/graphics/technology/alien-artifact.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified build_angelmods.sh
100644 → 100755
View file
Open in desktop
Empty file.