Skip to content
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.

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

Rework powderizing #852

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ data:extend({
type = "recipe",
name = "crystal-powder-splinter-blue",
localised_name = { "recipe-name.crystal-powder-from-splinter" },
category = "ore-refining-t1-5",
category = "powderizing-1",
subgroup = "bio-biter-processing-crystal-splinter",
enabled = false,
energy_required = 2,
Expand Down Expand Up @@ -159,7 +159,7 @@ data:extend({
type = "recipe",
name = "crystal-powder-splinter-red",
localised_name = { "recipe-name.crystal-powder-from-splinter" },
category = "ore-refining-t1-5",
category = "powderizing-1",
subgroup = "bio-biter-processing-crystal-splinter",
enabled = false,
energy_required = 2,
Expand Down Expand Up @@ -189,7 +189,7 @@ data:extend({
type = "recipe",
name = "crystal-powder-splinter-green",
localised_name = { "recipe-name.crystal-powder-from-splinter" },
category = "ore-refining-t1-5",
category = "powderizing-1",
subgroup = "bio-biter-processing-crystal-splinter",
enabled = false,
energy_required = 2,
Expand Down Expand Up @@ -345,7 +345,7 @@ data:extend({
type = "recipe",
name = "crystal-powder-shard-blue",
localised_name = { "recipe-name.crystal-powder-from-shard" },
category = "ore-refining-t1-5",
category = "powderizing-2",
subgroup = "bio-biter-processing-crystal-shard",
enabled = false,
energy_required = 2,
Expand Down Expand Up @@ -375,7 +375,7 @@ data:extend({
type = "recipe",
name = "crystal-powder-shard-red",
localised_name = { "recipe-name.crystal-powder-from-shard" },
category = "ore-refining-t1-5",
category = "powderizing-2",
subgroup = "bio-biter-processing-crystal-shard",
enabled = false,
energy_required = 2,
Expand Down Expand Up @@ -405,7 +405,7 @@ data:extend({
type = "recipe",
name = "crystal-powder-shard-green",
localised_name = { "recipe-name.crystal-powder-from-shard" },
category = "ore-refining-t1-5",
category = "powderizing-2",
subgroup = "bio-biter-processing-crystal-shard",
enabled = false,
energy_required = 2,
Expand Down Expand Up @@ -561,7 +561,7 @@ data:extend({
type = "recipe",
name = "crystal-powder-full-blue",
localised_name = { "recipe-name.crystal-powder-from-full" },
category = "ore-refining-t1-5",
category = "powderizing-3",
subgroup = "bio-biter-processing-crystal-full",
enabled = false,
energy_required = 2,
Expand Down Expand Up @@ -591,7 +591,7 @@ data:extend({
type = "recipe",
name = "crystal-powder-full-red",
localised_name = { "recipe-name.crystal-powder-from-full" },
category = "ore-refining-t1-5",
category = "powderizing-3",
subgroup = "bio-biter-processing-crystal-full",
enabled = false,
energy_required = 2,
Expand Down Expand Up @@ -621,7 +621,7 @@ data:extend({
type = "recipe",
name = "crystal-powder-full-green",
localised_name = { "recipe-name.crystal-powder-from-full" },
category = "ore-refining-t1-5",
category = "powderizing-3",
subgroup = "bio-biter-processing-crystal-full",
enabled = false,
energy_required = 2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ data:extend({
{
type = "recipe",
name = "crystal-powder-from-dust",
category = "ore-refining-t1-5",
category = "powderizing-1",
subgroup = "bio-biter-processing-crystal-full",
enabled = false,
energy_required = 2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data:extend({
{
type = "recipe",
name = "bio-puffer-egg-shell-powder",
category = "ore-refining-t1-5",
category = "powderizing-1",
subgroup = "bio-puffer-egg",
enabled = false,
energy_required = 1,
Expand Down
6 changes: 3 additions & 3 deletions angelsrefining/prototypes/buildings/powderizer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ data:extend({
module_slots = 1,
},
allowed_effects = { "consumption", "speed", "pollution", "productivity" },
crafting_categories = { "ore-refining-t1-5" },
crafting_categories = { "powderizing-1" },
crafting_speed = 1.5,
energy_source = {
type = "electric",
Expand Down Expand Up @@ -112,7 +112,7 @@ data:extend({
module_slots = 2,
},
allowed_effects = { "consumption", "speed", "pollution", "productivity" },
crafting_categories = { "ore-refining-t1-5" },
crafting_categories = { "powderizing-1", "powderizing-2" },
crafting_speed = 2,
energy_source = {
type = "electric",
Expand Down Expand Up @@ -186,7 +186,7 @@ data:extend({
module_slots = 3,
},
allowed_effects = { "consumption", "speed", "pollution", "productivity" },
crafting_categories = { "ore-refining-t1-5" },
crafting_categories = { "powderizing-1", "powderizing-2", "powderizing-3" },
crafting_speed = 3,
energy_source = {
type = "electric",
Expand Down
4 changes: 2 additions & 2 deletions angelsrefining/prototypes/recipes/refining-static.lua
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ data:extend({
type = "recipe",
name = "angelsore8-powder",
localised_name = { "recipe-name.angelsore8-powder" },
category = "ore-refining-t1-5",
category = "powderizing-1",
subgroup = "ore-processing-a",
energy_required = 2,
enabled = false,
Expand Down Expand Up @@ -224,7 +224,7 @@ data:extend({
type = "recipe",
name = "angelsore9-powder",
localised_name = { "recipe-name.angelsore9-powder" },
category = "ore-refining-t1-5",
category = "powderizing-1",
subgroup = "ore-processing-a",
energy_required = 2,
enabled = false,
Expand Down
5 changes: 4 additions & 1 deletion angelsrefining/prototypes/refining-category.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ data:extend({
{ type = "recipe-category", name = "angels-manual-crafting" }, -- used for manual crafting in character only },

{ type = "recipe-category", name = "ore-refining-t1" }, -- crusher
{ type = "recipe-category", name = "ore-refining-t1-5" }, -- powderizer
{ type = "recipe-category", name = "ore-refining-t2" }, -- flotation
{ type = "recipe-category", name = "ore-refining-t3" }, -- leaching
{ type = "recipe-category", name = "ore-refining-t3-5" }, -- electrowinning
{ type = "recipe-category", name = "ore-refining-t4" }, -- refinery

{ type = "recipe-category", name = "powderizing-1" }, -- powderizer
{ type = "recipe-category", name = "powderizing-2" },
{ type = "recipe-category", name = "powderizing-3" },

{ type = "recipe-category", name = "ore-sorting" },
{ type = "recipe-category", name = "ore-sorting-2" },
{ type = "recipe-category", name = "ore-sorting-3" },
Expand Down
2 changes: 2 additions & 0 deletions angelssmelting/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ Date: ???
- Advanced tungsten smelting and casting 1 - 2
- Split techs Advanced iron casting 3 (805)
- Split tech Advanced steel casting 3
- move ingot powders to ore powderizers
- add minimum tier requirements for ore powderizers
- Changed smelting tech tiers (841)
- Nitinol moved up
- Nickel moved up
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ if angelsmods.trigger.smelting_products["silicon"].powder then
{
name = "silicon-powder",
subgroup = "angels-silicon",
category = "powderizing-1",
energy_required = 0.5,
ingredients = {
{ "!!" },
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-alloy-steel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ data:extend({
{
type = "recipe",
name = "powder-steel",
category = "advanced-crafting",
category = "powderizing-1",
subgroup = "angels-iron",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-aluminium.lua
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ data:extend({
{
type = "recipe",
name = "powder-aluminium",
category = "advanced-crafting",
category = "powderizing-1",
subgroup = "angels-aluminium",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-chrome.lua
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ data:extend({
{
type = "recipe",
name = "powder-chrome",
category = "advanced-crafting",
category = "powderizing-3",
subgroup = "angels-chrome",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-cobalt.lua
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ data:extend({
{
type = "recipe",
name = "powder-cobalt",
category = "advanced-crafting",
category = "powderizing-2",
subgroup = "angels-cobalt",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-copper.lua
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ data:extend({
{
type = "recipe",
name = "powder-copper",
category = "advanced-crafting",
category = "powderizing-1",
subgroup = "angels-copper",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-gold.lua
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ data:extend({
{
type = "recipe",
name = "powder-gold",
category = "advanced-crafting",
category = "powderizing-2",
subgroup = "angels-gold",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-iron.lua
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ data:extend({
{
type = "recipe",
name = "powder-iron",
category = "advanced-crafting",
category = "powderizing-1",
subgroup = "angels-iron",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-lead.lua
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ data:extend({
{
type = "recipe",
name = "powder-lead",
category = "advanced-crafting",
category = "powderizing-1",
subgroup = "angels-lead",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-manganese.lua
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ data:extend({
{
type = "recipe",
name = "powder-manganese",
category = "advanced-crafting",
category = "powderizing-1",
subgroup = "angels-manganese",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-nickel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ data:extend({
{
type = "recipe",
name = "powder-nickel",
category = "advanced-crafting",
category = "powderizing-1",
subgroup = "angels-nickel",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-platinum.lua
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ data:extend({
{
type = "recipe",
name = "powder-platinum",
category = "advanced-crafting",
category = "powderizing-3",
subgroup = "angels-platinum",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-silicon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ data:extend({
{
type = "recipe",
name = "powder-silicon",
category = "advanced-crafting",
category = "powderizing-1",
subgroup = "angels-silicon",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-silver.lua
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ data:extend({
{
type = "recipe",
name = "powder-silver",
category = "advanced-crafting",
category = "powderizing-1",
subgroup = "angels-silver",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-tin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ data:extend({
{
type = "recipe",
name = "powder-tin",
category = "advanced-crafting",
category = "powderizing-1",
subgroup = "angels-tin",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-titanium.lua
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ data:extend({
{
type = "recipe",
name = "powder-titanium",
category = "advanced-crafting",
category = "powderizing-2",
subgroup = "angels-titanium",
energy_required = 0.5,
enabled = false,
Expand Down
2 changes: 1 addition & 1 deletion angelssmelting/prototypes/recipes/smelting-zinc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ data:extend({
{
type = "recipe",
name = "powder-zinc",
category = "advanced-crafting",
category = "powderizing-2",
subgroup = "angels-zinc",
energy_required = 0.5,
enabled = false,
Expand Down