diff --git a/data-updates.lua b/data-updates.lua index a0c5f44..a509bf1 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -22,8 +22,7 @@ end data.raw.item["centrifuge"].subgroup = "adamo-nuclear-production-machine" data.raw.item["centrifuge"].order = "n[centrifuge]" -data.raw["assembling-machine"] -.centrifuge.fluid_boxes = centrifuge_fluid_boxes() +data.raw["assembling-machine"].centrifuge.fluid_boxes = adamo.centrifuge.fluid_boxes() local reactor_coolant_color = {r = 1,g = 0.9,b = 0.8,a = 1} @@ -62,18 +61,18 @@ if data.raw.recipe["plutonium-239-alpha-decay"] then data.raw.recipe["plutonium-239-alpha-decay"].hidden = true end -local ore = data.raw.item["uranium-ore"] -local heu_fuel_recipe = data.raw.recipe["uranium-fuel-cell"] -local heu_fuel_item = data.raw.item["uranium-fuel-cell"] -local heu_used_fuel_item = data.raw.item["used-up-uranium-fuel-cell"] +local ore = data.raw.item["uranium-ore"] +local heu_fuel_recipe = data.raw.recipe["uranium-fuel-cell"] +local heu_fuel_item = data.raw.item["uranium-fuel-cell"] +local heu_used_fuel_item = data.raw.item["used-up-uranium-fuel-cell"] local nuclear_fuel_recipe = data.raw.recipe["nuclear-fuel"] -local nuclear_fuel_item = data.raw.item["nuclear-fuel"] -local ammo = data.raw.recipe["uranium-rounds-magazine"] -local shell = data.raw.recipe["uranium-cannon-shell"] -local explosive_shell = data.raw.recipe["explosive-uranium-cannon-shell"] -local atomic_bomb = data.raw.recipe["atomic-bomb"] -local reactor_item = data.raw.item["nuclear-reactor"] -local reactor = data.raw.reactor["nuclear-reactor"] +local nuclear_fuel_item = data.raw.item["nuclear-fuel"] +local ammo = data.raw.recipe["uranium-rounds-magazine"] +local shell = data.raw.recipe["uranium-cannon-shell"] +local explosive_shell = data.raw.recipe["explosive-uranium-cannon-shell"] +local atomic_bomb = data.raw.recipe["atomic-bomb"] +local reactor_item = data.raw.item["nuclear-reactor"] +local reactor = data.raw.reactor["nuclear-reactor"] ore.icon = "__adamo-nuclear__/graphics/icons/yellowcake.png" ore.icon_size = 32 @@ -88,13 +87,13 @@ heu_fuel_recipe.ingredients = { {"adamo-nuclear-HEU-oxide",1}, {"iron-plate",1} } -heu_fuel_recipe.category = "advanced-crafting" -heu_fuel_recipe.result = "uranium-fuel-cell" +heu_fuel_recipe.category = "advanced-crafting" +heu_fuel_recipe.result = "uranium-fuel-cell" heu_fuel_recipe.result_count = nil -heu_fuel_recipe.results = nil -heu_fuel_recipe.group = nil -heu_fuel_recipe.subgroup = nil -heu_fuel_recipe.order = nil +heu_fuel_recipe.results = nil +heu_fuel_recipe.group = nil +heu_fuel_recipe.subgroup = nil +heu_fuel_recipe.order = nil table.insert( data.raw.technology["nuclear-power"].effects, @@ -224,14 +223,16 @@ reactor_item.icon = reactor_item.icon_size = 32 table.insert(data.raw.recipe["nuclear-reactor"].ingredients, - {type = "item",name="adamo-nuclear-DU-oxide",amount=150}) + {type = "item",name="adamo-nuclear-DU-oxide",amount=200}) reactor.default_fuel_glow_color = reactor_coolant_color reactor.use_fuel_glow_color = true -reactor.light.intensity = 0 +-- Not necessary as long as Factorio base data +-- includes no light on nuclear-reactor. +-- reactor.light.intensity = 0 reactor.energy_source.light_flicker = {} reactor.energy_source.light_flicker.minimum_intensity = 0.5 reactor.energy_source.light_flicker.maximum_intensity = 0.5 @@ -381,7 +382,9 @@ local fe_name,fe_count = get_ingredient(FeU_recipe,'iron-plate') add_ingredient(FeU_recipe,'adamo-nuclear-DU-oxide',fe_count) replace_recipe_io(FeU_recipe,'iron-plate','iron-ore') mult_recipe_io(FeU_recipe,2,'steel-plate') +adamo.recipe.set.productivity(FeU_recipe) data:extend({FeU_recipe}) add_recipe_to_tech("uranium-processing","adamo-nuclear-steel-plate") --- adamo.logging = false \ No newline at end of file +add_prereq_to_tech("kovarex-enrichment-process","nuclear-fuel-reprocessing") +data.raw.recipe["nuclear-fuel"].category="neutron-bombardment" diff --git a/data.lua b/data.lua index eb03822..a129694 100644 --- a/data.lua +++ b/data.lua @@ -8,10 +8,10 @@ local uranium_hex_base_color = {r = 0.5,g = 0.5,b = 0.5,a = 0.5} local uranium_hex_flow_color = {r = 0.5,g = 0.5,b = 0.5,a = 0.1} local plutonium_hex_base_color = {r= 100,g = 10,b = 10,a = 150} local plutonium_hex_flow_color = {r= 100,g = 10,b = 10,a = 25} -local aqueous_raffinate_base_color = colors.midbrown -local aqueous_raffinate_flow_color = colors.highbrown -local raffinate_base_color = colors.darkbrown -local raffinate_flow_color = colors.midbrown +local aqueous_raffinate_base_color = adamo.colors.midbrown +local aqueous_raffinate_flow_color = adamo.colors.highbrown +local raffinate_base_color = adamo.colors.darkbrown +local raffinate_flow_color = adamo.colors.midbrown local oxide_color_table = { NU = {r=139,g=69,b=19}, DU = {r = 32, g = 32, b = 32}, @@ -22,7 +22,6 @@ local oxide_color_table = { WGPu = {r = 0, g = 255, b = 0}, } - -- Code uses "nuclear" as fast-reaction fuel category. local bombardment_category = { type = "recipe-category", @@ -157,7 +156,7 @@ local HEU_PUREX_hex_fluid = { max_temperature = 100, heat_capacity = "0.1KJ", } -local aqueous_raffinate_fluid = { +local weak_fissile_fluid = { type = "fluid", name = "adamo-nuclear-aqueous-raffinate", subgroup = "adamo-nuclear-raffinate-group", @@ -169,9 +168,8 @@ local aqueous_raffinate_fluid = { default_temperature = 25, max_temperature = 100, heat_capacity = "0.01KJ", - } -local raffinate_fluid = { +local strong_fissile_fluid = { type = "fluid", name = "adamo-nuclear-raffinate", subgroup = "adamo-nuclear-raffinate-group", @@ -189,8 +187,8 @@ data:extend({ Pu_hex_fluid, LEU_PUREX_hex_fluid, HEU_PUREX_hex_fluid, - aqueous_raffinate_fluid, - raffinate_fluid + weak_fissile_fluid, + strong_fissile_fluid }) local urania_item = { @@ -271,7 +269,7 @@ local thermal_reactor_item = { subgroup = "energy", order = "b[steam-power]-b[adamo-nuclear-thermal-reactor]", place_result = "adamo-nuclear-thermal-reactor", - stack_size = 25 + stack_size = 50 } local prod_reactor_item = { type = "item", @@ -359,8 +357,8 @@ local urania_recipe_hydrofluoric = { always_show_made_in = true, crafting_machine_tint = { primary = oxide_color_table.NU, - secondary = colors.hf_base, - tertiary = colors.hf_flow, + secondary = adamo.colors.hf_base, + tertiary = adamo.colors.hf_flow, quaternary = data.raw.fluid.water.flow_color }, } @@ -371,7 +369,7 @@ local urania_hex_recipe = { enabled = false, subgroup = "adamo-nuclear-processing-group", main_product = "adamo-nuclear-natural-uranium-hex", - energy_required = 30, + energy_required = 10, ingredients = {{ type = "item", name = "adamo-nuclear-urania", @@ -394,8 +392,8 @@ local urania_hex_recipe = { always_show_made_in = true, crafting_machine_tint = { primary = uranium_hex_base_color, - secondary = colors.hf_base, - tertiary = colors.hf_flow, + secondary = adamo.colors.hf_base, + tertiary = adamo.colors.hf_flow, quaternary = oxide_color_table.NU }, } @@ -403,23 +401,25 @@ local LEU_enrichment_recipe = { type = "recipe", category = "centrifuging", name = "adamo-nuclear-LEU-enrichment", - energy_required = 7.75, + energy_required = 10, subgroup = "adamo-nuclear-enrichment-group", order = "m1", enabled = false, ingredients = {{ type = "fluid", name = "adamo-nuclear-natural-uranium-hex", - amount = 7.75 + amount = 10 }}, results = {{ type = "fluid", name = "adamo-nuclear-DU-hex", - amount = 6.75 + amount = 10, + probability = 6.75/7.75 },{ type = "fluid", name = "adamo-nuclear-LEU-hex", - amount = 1 + amount = 10, + probability = 1/7.75 }}, icon_size = 64, icon = "__adamo-nuclear__/graphics/icons/LEU-enrichment.png", @@ -428,23 +428,25 @@ local HEU_enrichment_recipe = { type = "recipe", category = "centrifuging", name = "adamo-nuclear-HEU-enrichment", - energy_required = 37.5, + energy_required = 10, subgroup = "adamo-nuclear-enrichment-group", order = "m2", enabled = false, ingredients = {{ type = "fluid", name = "adamo-nuclear-natural-uranium-hex", - amount = 37.5 + amount = 10 }}, results = {{ type = "fluid", name = "adamo-nuclear-DU-hex", - amount = 36.5 + amount = 10, + probability = 36.5/37.5 },{ type = "fluid", name = "adamo-nuclear-HEU-hex", - amount = 1 + amount = 10, + probability = 1/37.5 }}, icon_size = 64, icon = "__adamo-nuclear__/graphics/icons/HEU-enrichment.png", @@ -453,23 +455,25 @@ local WGU_enrichment_recipe = { type = "recipe", category = "centrifuging", name = "adamo-nuclear-WGU-enrichment", - energy_required = 150, + energy_required = 10, subgroup = "adamo-nuclear-enrichment-group", order = "m3", enabled = false, ingredients = {{ type = "fluid", name = "adamo-nuclear-natural-uranium-hex", - amount = 150 + amount = 10 }}, results = {{ type = "fluid", name = "adamo-nuclear-DU-hex", - amount = 149 + amount = 10, + probability = 149/150 },{ type = "fluid", name = "adamo-nuclear-WGU-hex", - amount = 1 + amount = 10, + probability = 1/150 }}, icon_size = 64, icon = "__adamo-nuclear__/graphics/icons/WGU-enrichment.png", @@ -478,23 +482,23 @@ local Pu_enrichment_recipe = { type = "recipe", category = "centrifuging", name = "adamo-nuclear-WGPu-enrichment", - energy_required = 2, + energy_required = 20, subgroup = "adamo-nuclear-enrichment-group", order = "n1", enabled = false, ingredients = {{ type = "fluid", name = "adamo-nuclear-Pu-hex", - amount = 2 + amount = 20 }}, results = {{ type = "fluid", name = "adamo-nuclear-RGPu-hex", - amount = 1 + amount = 10, },{ type = "fluid", name = "adamo-nuclear-WGPu-hex", - amount = 1 + amount = 10, }}, icon_size = 64, icon = "__adamo-nuclear__/graphics/icons/WGPu-enrichment.png", @@ -503,27 +507,30 @@ local LEU_PUREX_enrichment_recipe = { type = "recipe", category = "centrifuging", name = "adamo-nuclear-LEU-PUREX-enrichment", - energy_required = 150, + energy_required = 10, subgroup = "adamo-nuclear-enrichment-group", order = "o1", enabled = false, ingredients = {{ type = "fluid", name = "adamo-nuclear-LEU-PUREX-hex", - amount = 150 + amount = 10 }}, results = {{ type = "fluid", name = "adamo-nuclear-LEU-hex", - amount = 135 + amount = 10, + probability = 135/150 },{ type = "fluid", name = "adamo-nuclear-Pu-hex", - amount = 1 + amount = 10, + probability = 1/150 },{ type = "fluid", name = "adamo-nuclear-DU-hex", - amount = 14 + amount = 10, + probability = 14/150 }}, icon_size = 64, icon = "__adamo-nuclear__/graphics/icons/LEU-PUREX-enrichment.png", @@ -532,27 +539,30 @@ local HEU_PUREX_enrichment_recipe = { type = "recipe", category = "centrifuging", name = "adamo-nuclear-HEU-PUREX-enrichment", - energy_required = 70, + energy_required = 10, subgroup = "adamo-nuclear-enrichment-group", order = "o2", enabled = false, ingredients = {{ type = "fluid", name = "adamo-nuclear-HEU-PUREX-hex", - amount = 70 + amount = 10 }}, results = {{ type = "fluid", name = "adamo-nuclear-HEU-hex", - amount = 67 + amount = 10, + probability = 67/70 },{ type = "fluid", name = "adamo-nuclear-Pu-hex", - amount = 1 + amount = 10, + probability = 1/70 },{ type = "fluid", name = "adamo-nuclear-DU-hex", - amount = 2 + amount = 10, + probability = 2/70 }}, icon_size = 64, icon = "__adamo-nuclear__/graphics/icons/HEU-PUREX-enrichment.png", @@ -587,7 +597,7 @@ local RGPu_recipe = { }}, crafting_machine_tint = { primary = oxide_color_table.RGPu, - secondary = colors.hf_base, + secondary = adamo.colors.hf_base, tertiary = plutonium_hex_flow_color, quaternary = data.raw.fluid.water.flow_color }, @@ -615,6 +625,52 @@ local plutonia_238_recipe = { }}, result = "adamo-nuclear-Pu238-oxide", } +local LEU_PUREX_stage_1 = { + type = "recipe", + category = "chemistry", + name = "adamo-nuclear-LEU-PUREX-stage-1", + subgroup = "adamo-nuclear-spent-fuel-group", + order = "m1", + energy_required = 10, + emissions_multiplier = 3, + enabled = false, + ingredients = { + {"adamo-nuclear-used-up-LEU-fuel-cell", 1}, + { + type = "fluid", + name = "petroleum-gas", + amount = 10 + }, + { + type = "fluid", + name = "water", + amount = 10 + }, + }, + results = { + {waste_item.name, 1}, + {actinides_item.name, 1}, + { + type = "fluid", + name = weak_fissile_fluid.name, + amount = 10 + } + }, + crafting_machine_tint = { + primary = weak_fissile_fluid.base_color, + secondary = aqueous_raffinate_base_color, + tertiary = sulfuric_flow_color, + quaternary = oxide_color_table.LEU + } +} +local LEU_PUREX_stage_2 = { + type = "recipe", + category = "chemistry", + name = "adamo-nuclear-LEU-PUREX-stage-2", + subgroup = "adamo-nuclear-spent-fuel-group", + order = "m2", + energy_required +} local LEU_PUREX_recipe_sulfuric = { type = "recipe", category = "chemistry", @@ -647,7 +703,8 @@ local LEU_PUREX_recipe_sulfuric = { amount = 150 },{ type = "fluid", - name = "adamo-nuclear-aqueous-raffinate", + -- name = "adamo-nuclear-aqueous-raffinate", + name = "adamo-nuclear-raffinate", amount = 209 }}, icon_size = 64, @@ -683,7 +740,8 @@ local LEU_PUREX_recipe_hydrofluoric = { }}, results = {{ type = "fluid", - name = "adamo-nuclear-aqueous-raffinate", + -- name = "adamo-nuclear-aqueous-raffinate", + name = "adamo-nuclear-raffinate", amount = 209 },{ type = "fluid", @@ -695,7 +753,7 @@ local LEU_PUREX_recipe_hydrofluoric = { crafting_machine_tint = { primary = uranium_hex_base_color, secondary = aqueous_raffinate_base_color, - tertiary = colors.hf_flow, + tertiary = adamo.colors.hf_flow, quaternary = oxide_color_table.LEU }, } @@ -727,7 +785,8 @@ local HEU_PUREX_recipe_sulfuric = { }}, results = {{ type = "fluid", - name = "adamo-nuclear-aqueous-raffinate", + -- name = "adamo-nuclear-aqueous-raffinate", + name = "adamo-nuclear-raffinate", amount = 231 },{ type = "fluid", @@ -767,7 +826,8 @@ local HEU_PUREX_recipe_hydrofluoric = { }}, results = {{ type = "fluid", - name = "adamo-nuclear-aqueous-raffinate", + -- name = "adamo-nuclear-aqueous-raffinate", + name = "adamo-nuclear-raffinate", amount = 231 },{ type = "fluid", @@ -779,7 +839,7 @@ local HEU_PUREX_recipe_hydrofluoric = { crafting_machine_tint = { primary = uranium_hex_base_color, secondary = aqueous_raffinate_base_color, - tertiary = colors.hf_flow, + tertiary = adamo.colors.hf_flow, quaternary = oxide_color_table.HEU }, } @@ -812,7 +872,8 @@ local LEU_REMIX_recipe = { results = {{ type = "fluid", name = "adamo-nuclear-raffinate", - amount = 10 + -- amount = 10 + amount = 100 },{ type = "item", name = "adamo-nuclear-LEU-fuel-cell", @@ -822,7 +883,7 @@ local LEU_REMIX_recipe = { icon = "__adamo-nuclear__/graphics/icons/LEU-REMIX.png", crafting_machine_tint = { primary = raffinate_base_color, - secondary = colors.highgrey, + secondary = adamo.colors.highgrey, tertiary = pg_flow_color, quaternary = oxide_color_table.LEU }, @@ -860,13 +921,14 @@ local MOX_REMIX_recipe = { },{ type = "fluid", name = "adamo-nuclear-raffinate", - amount = 20 + -- amount = 20 + amount = 200 }}, icon_size = 64, icon = "__adamo-nuclear__/graphics/icons/MOX-REMIX.png", crafting_machine_tint = { primary = raffinate_base_color, - secondary = colors.highgrey, + secondary = adamo.colors.highgrey, tertiary = pg_flow_color, quaternary = oxide_color_table.RGPu }, @@ -899,32 +961,32 @@ local MOX_fuel_recipe = { }, results = {{"adamo-nuclear-MOX-fuel-cell",100}}, } -local aqueous_raffinate_processing_recipe = { - type = "recipe", - category = "chemistry", - name = "adamo-nuclear-aqueous-raffinate-processing", - subgroup = "adamo-nuclear-processing-group", - order = "p1", - energy_required = 30, - category = "chemistry", - enabled = false, - ingredients = {{ - type = "fluid", - name = "adamo-nuclear-aqueous-raffinate", - amount = 300 - }}, - results = {{ - type = "fluid", - name = "adamo-nuclear-raffinate", - amount = 1, - }}, - crafting_machine_tint = { - primary = raffinate_base_color, - secondary = aqueous_raffinate_base_color, - tertiary = aqueous_raffinate_flow_color, - quaternary = raffinate_flow_color - }, -} +-- local aqueous_raffinate_processing_recipe = { +-- type = "recipe", +-- category = "chemistry", +-- name = "adamo-nuclear-aqueous-raffinate-processing", +-- subgroup = "adamo-nuclear-processing-group", +-- order = "p1", +-- energy_required = 30, +-- category = "chemistry", +-- enabled = false, +-- ingredients = {{ +-- type = "fluid", +-- name = "adamo-nuclear-aqueous-raffinate", +-- amount = 300 +-- }}, +-- results = {{ +-- type = "fluid", +-- name = "adamo-nuclear-raffinate", +-- amount = 1, +-- }}, +-- crafting_machine_tint = { +-- primary = raffinate_base_color, +-- secondary = aqueous_raffinate_base_color, +-- tertiary = aqueous_raffinate_flow_color, +-- quaternary = raffinate_flow_color +-- }, +-- } local raffinate_processing_recipe = { type = "recipe", name = "adamo-nuclear-raffinate-processing", @@ -938,11 +1000,11 @@ local raffinate_processing_recipe = { ingredients = {{ type = "fluid", name = "adamo-nuclear-raffinate", - amount = 30, + amount = 300, },{ type = "fluid", name = "water", - amount = 30, + amount = 300, },{ type = "item", name = "stone", @@ -961,7 +1023,7 @@ local raffinate_processing_recipe = { primary = raffinate_base_color, secondary = {r = 227, g = 124, b = 14}, tertiary = raffinate_flow_color, - quaternary = colors.highbrown + quaternary = adamo.colors.highbrown }, } local plutonium_rocket_recipe = { @@ -1019,10 +1081,12 @@ local prod_reactor_recipe = { energy_required = 4, enabled = false, ingredients = { - {"concrete", 150}, - {"steel-plate", 75}, - {"advanced-circuit", 120}, - {"iron-gear-wheel", 120} + {"centrifuge", 1}, + {"adamo-nuclear-DU-oxide", 100}, + {"refined-concrete", 100}, + {"filter-inserter",5}, + {"steel-chest",5} + -- processing unit? }, result = "adamo-nuclear-production-reactor", } @@ -1046,7 +1110,7 @@ data:extend({ MOX_REMIX_recipe, LEU_fuel_recipe, MOX_fuel_recipe, - aqueous_raffinate_processing_recipe, + -- aqueous_raffinate_processing_recipe, raffinate_processing_recipe, plutonium_rocket_recipe, thermal_reactor_recipe, @@ -1062,10 +1126,11 @@ add_recipes_to_tech("uranium-processing", { }) add_recipes_to_tech("nuclear-power", { "adamo-nuclear-HEU-enrichment", - "adamo-nuclear-WGU-enrichment", - "atomic-bomb" + "adamo-nuclear-WGU-enrichment" }) +move_recipe_to_tech("nuclear-power","atomic-bomb") add_recipes_to_tech("nuclear-fuel-reprocessing", { + "adamo-nuclear-production-reactor", "adamo-nuclear-LEU-PUREX-by-HF", "adamo-nuclear-LEU-PUREX-by-H2SO4", "adamo-nuclear-LEU-REMIX", @@ -1075,11 +1140,10 @@ add_recipes_to_tech("nuclear-fuel-reprocessing", { "adamo-nuclear-HEU-PUREX-enrichment", "adamo-nuclear-transmute-Pu238-oxide", "adamo-nuclear-highgrade-RGPu-oxide", + -- "adamo-nuclear-aqueous-raffinate-processing", "adamo-nuclear-raffinate-processing" }) add_recipes_to_tech("kovarex-enrichment-process", { - "adamo-nuclear-aqueous-raffinate-processing", - "adamo-nuclear-production-reactor", "adamo-nuclear-MOX-fuel-cell", "adamo-nuclear-MOX-REMIX" }) @@ -1087,7 +1151,7 @@ add_recipes_to_tech("atomic-bomb", { "adamo-nuclear-WGPu-enrichment", "adamo-nuclear-thermonuclear-rocket" }) -set_productivity_recipes({ +adamo.recipes.set.productivity({ "adamo-nuclear-urania-by-H2SO4", "adamo-nuclear-urania-by-HF", "adamo-nuclear-raffinate-processing", @@ -1146,8 +1210,8 @@ for _,grade in pairs({ hide_from_player_crafting = true, crafting_machine_tint = { primary = hex_color, - secondary = colors.hf_base, - tertiary = colors.hf_flow, + secondary = adamo.colors.hf_base, + tertiary = adamo.colors.hf_flow, quaternary = oxide_color }, } @@ -1178,7 +1242,7 @@ for _,grade in pairs({ amount = 1 }}, crafting_machine_tint = { - primary = colors.hf_base, + primary = adamo.colors.hf_base, secondary = oxide_color, tertiary = hex_flow_color, quaternary = data.raw.fluid.water.flow_color @@ -1210,10 +1274,10 @@ for _,grade in pairs({ } data:extend({hex_recipe,oxide_recipe,item,fluid}) if grade:match "Pu" then - add_recipe_to_tech("kovarex-enrichment-process", + add_recipe_to_tech("atomic-bomb", "adamo-nuclear-"..grade.."-oxide" ) - add_recipe_to_tech("kovarex-enrichment-process", + add_recipe_to_tech("atomic-bomb", "adamo-nuclear-"..grade.."-hex" ) elseif grade:match "LEU" or grade:match "DU" then @@ -1503,6 +1567,10 @@ local thermal_reactor_entity = { burning_cooldown = 20 } local prod_anim_speed = 0.5 +local prod_reactor_corpse = adamo.centrifuge.remnants(5/3) +prod_reactor_corpse.name = "adamo-nuyclear-production-reactor-remnants" +local prod_reactor_explosion = adamo.centrifuge.explosion(5/3) +prod_reactor_explosion.name = "adamo-nuclear-production-reactor-explosion" local prod_reactor_entity = { type = "assembling-machine", name = "adamo-nuclear-production-reactor", @@ -1528,7 +1596,7 @@ local prod_reactor_entity = { }, energy_usage = "750kW", module_specification = { - module_slots = 3 + module_slots = 4 }, allowed_effects = { "consumption", @@ -1536,22 +1604,20 @@ local prod_reactor_entity = { "productivity", "pollution" }, - corpse = "big-remnants", - dying_explosion = "medium-explosion", + corpse = "adamo-nuyclear-production-reactor-remnants", + dying_explosion = "adamo-nuclear-production-reactor-explosion", resistances = {{ type = "fire", percent = 70 }}, - collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, - selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, - drawing_box = {{-1.5, -2.2}, {1.5, 1.5}}, + collision_box = adamo.centrifuge.collision_box(5/3), + selection_box = adamo.centrifuge.selection_box(5/3), + drawing_box = adamo.centrifuge.drawing_box(5/3), always_draw_idle_animation = true, - idle_animation = {layers = centrifuge_idle_layers(1,prod_anim_speed)}, + idle_animation = {layers = adamo.centrifuge.idle_layers(3/2,prod_anim_speed)}, animation = { layers = {{ - filename = - "__adamo-nuclear__/graphics/entity/" - .."production-reactor-C-light.png", + filename = "__adamo-nuclear__/graphics/entity/production-reactor-C-light.png", priority = "high", blend_mode = "additive", -- centrifuge line_length = 8, @@ -1559,20 +1625,23 @@ local prod_reactor_entity = { height = 104, frame_count = 64, animation_speed = prod_anim_speed, - shift = util.by_pixel(0, -27), + draw_as_glow = true, + shift = util.by_pixel(0*3/2, -27*3/2), + scale = 3/2, hr_version = { - filename = + filename = "__adamo-nuclear__/graphics/entity/" .."hr-production-reactor-C-light.png", priority = "high", - scale = 0.5, + scale = 0.5*3/2, blend_mode = "additive", -- centrifuge line_length = 8, width = 190, height = 207, frame_count = 64, animation_speed = prod_anim_speed, - shift = util.by_pixel(0, -27.25) + draw_as_glow = true, + shift = util.by_pixel(0*3/2, -27.25*3/2) } },{ filename = @@ -1585,20 +1654,23 @@ local prod_reactor_entity = { height = 103, frame_count = 64, animation_speed = prod_anim_speed, - shift = util.by_pixel(16.5, 0.5), + draw_as_glow = true, + shift = util.by_pixel(16.5*3/2, 0.5*3/2), + scale = 3/2, hr_version = { filename = "__adamo-nuclear__/graphics/entity/" .."hr-production-reactor-B-light.png", priority = "high", - scale = 0.5, + scale = 0.5*3/2, blend_mode = "additive", -- centrifuge line_length = 8, width = 131, height = 206, frame_count = 64, animation_speed = prod_anim_speed, - shift = util.by_pixel(16.75, 0.5) + draw_as_glow = true, + shift = util.by_pixel(16.75*3/2, 0.5*3/2) } },{ filename = @@ -1611,28 +1683,32 @@ local prod_reactor_entity = { height = 98, frame_count = 64, animation_speed = prod_anim_speed, - shift = util.by_pixel(-23.5, -2), + draw_as_glow = true, + shift = util.by_pixel(-23.5*3/2, -2*3/2), + scale = 3/2, hr_version = { filename = "__adamo-nuclear__/graphics/entity/" .."hr-production-reactor-A-light.png", priority = "high", - scale = 0.5, + scale = 0.5*3/2, blend_mode = "additive", -- centrifuge line_length = 8, width = 108, height = 197, frame_count = 64, animation_speed = prod_anim_speed, - shift = util.by_pixel(-23.5, -1.75) + draw_as_glow = true, + shift = util.by_pixel(-23.5*3/2, -1.75*3/2) } }} }, working_visualisations = {{ effect = "uranium-glow", + fadeout = true, light = { - intensity = 0.35, - size = 7, + intensity = 0.55, + size = 9.9*3/2, shift = {0.0, 0.0}, color = { r = 0.0, @@ -1664,12 +1740,14 @@ local prod_reactor_entity = { idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, apparent_volume = 1.5 }, - fluid_boxes = centrifuge_fluid_boxes() + fluid_boxes = adamo.centrifuge.fluid_boxes(5/3) } data:extend({ thermal_reactor_entity, prod_reactor_entity, + prod_reactor_corpse, + prod_reactor_explosion, }) local plutonium_explosion_wave = { @@ -1856,4 +1934,4 @@ data:extend({ plutonium_explosion_wave, plutonium_rocket_projectile, plutonium_rocket_ammo -}) \ No newline at end of file +}) diff --git a/locale/en/base.cfg b/locale/en/base.cfg index fd4d780..cc8fa43 100644 --- a/locale/en/base.cfg +++ b/locale/en/base.cfg @@ -2,17 +2,19 @@ adamo-nuclear-group=Nuclear engineering [technology-name] -atomic-bomb=Weapons-grade plutonium -adamo-nuclear-fast-reactor=Fast Nuclear Reactor -kovarex-enrichment-process=Advanced Nuclear Fuel Reprocessing +atomic-bomb=Thermonuclear rocketry +adamo-nuclear-fast-reactor=Fast nuclear reactor +nuclear-fuel-reprocessing=Nuclear fuel processing +kovarex-enrichment-process=Advanced nuclear fuel processing +nuclear-power=Nuclear engineering [fuel-category-name] adamo-nuclear-thermal-reaction=Thermal nuclear fuel [fluid-name] adamo-nuclear-natural-uranium-hex=Natural uranium hex -adamo-nuclear-raffinate=Nuclear raffinate -adamo-nuclear-aqueous-raffinate=Aqueous nuclear raffinate +adamo-nuclear-raffinate=Nuclear sludge +adamo-nuclear-aqueous-raffinate=Nuclear water adamo-nuclear-HEU-hex=High-enriched uranium hex adamo-nuclear-LEU-hex=Low-enriched uranium hex adamo-nuclear-DU-hex=Depleted uranium hex @@ -44,8 +46,8 @@ adamo-nuclear-MOX-fuel-cell=MOX fuel cell used-up-uranium-fuel-cell=Spent HEU fuel cell adamo-nuclear-used-up-LEU-fuel-cell=Spent LEU fuel cell adamo-nuclear-used-up-MOX-fuel-cell=Spent MOX fuel cell -atomic-bomb=Nuclear Rocket -adamo-nuclear-thermonuclear-rocket=Thermonuclear Rocket +atomic-bomb=Nuclear rocket +adamo-nuclear-thermonuclear-rocket=Thermonuclear rocket [recipe-name] adamo-nuclear-LEU-enrichment=Low uranium enrichment @@ -60,12 +62,12 @@ adamo-nuclear-HEU-PUREX-by-HF=HEU PUREX adamo-nuclear-HEU-PUREX-by-H2SO4=HEU PUREX adamo-nuclear-LEU-REMIX=LEU REMIX adamo-nuclear-MOX-REMIX=MOX REMIX -adamo-nuclear-raffinate-processing=Raffinate processing -adamo-nuclear-aqueous-raffinate-processing=Aqueous raffinate processing +adamo-nuclear-raffinate-processing=Nuclear sludge processing +adamo-nuclear-aqueous-raffinate-processing=Nuclear water reduction [entity-name] adamo-nuclear-production-reactor=Production reactor -nuclear-reactor=Liquid-metal-cooled nuclear reactor +nuclear-reactor=Unmoderated reactor adamo-nuclear-thermal-reactor=Thermal nuclear boiler [technology-description] @@ -93,7 +95,7 @@ adamo-nuclear-Pu238-oxide=Neutron irradiation of actinides by spallation to gene adamo-nuclear-thermonuclear-rocket=Thermonuclear Rocket with depleted uranium reflection. [entity-description] -centrifuge=Sorts isotopes by mass. +centrifuge=Sorts particles by mass. nuclear-reactor=Reacts by a fast neutron spectrum. adamo-nuclear-thermal-reactor=Reacts by a moderated neutron spectrum. adamo-nuclear-production-reactor=Sorts and irradiates material using a pool reactor. Has a water-based particle accelerator.