diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index e8cbcfa14..849be2e85 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -29,8 +29,14 @@ id: "66960076A74E9B79" linked_quest: "0CA5B715B76E4A5B" shape: "diamond" - x: 9.5d - y: -2.0d + x: 14.0d + y: 2.5d + } + { + id: "6058CD9466BE0852" + linked_quest: "00202200344F3456" + x: 12.0d + y: 4.0d } ] quests: [ @@ -225,6 +231,7 @@ id: "24ECDF70031B39C4" shape: "gear" size: 2.0d + subtitle: "{quests.extreme_voltage.abs.subtitle}" tasks: [{ id: "5F816121BE08205B" item: "gtceu:alloy_blast_smelter" @@ -379,8 +386,8 @@ item: "gtceu:large_centrifuge" type: "item" }] - x: 8.5d - y: 3.5d + x: 15.5d + y: 1.5d } { dependencies: [ @@ -656,6 +663,8 @@ dependencies: [ "618D55F4BF91731F" "075434DAB3D9F0EA" + "5FA09DA68D309548" + "00202200344F3456" ] description: [ "{quests.extreme_voltage.heat_exchanger.desc.1}" @@ -675,8 +684,8 @@ type: "item" }] title: "{quests.extreme_voltage.heat_exchanger.title}" - x: 14.5d - y: 7.0d + x: 13.0d + y: 5.5d } { description: ["{quests.extreme_voltage.ammonium_formate.desc}"] @@ -703,8 +712,8 @@ } ] title: "{quests.extreme_voltage.ammonium_formate.title}" - x: 14.5d - y: 8.0d + x: 12.0d + y: 5.5d } { dependencies: ["75725B3F6603F1D0"] @@ -723,8 +732,8 @@ type: "checkmark" } ] - x: 14.5d - y: 4.5d + x: 14.0d + y: 5.5d } { dependencies: [ @@ -756,8 +765,8 @@ } ] title: "{quests.extreme_voltage.nuclear_residue_dust.title}" - x: 13.0d - y: 4.5d + x: 15.5d + y: 5.5d } { dependencies: [ @@ -779,8 +788,8 @@ type: "checkmark" } ] - x: 8.5d - y: 4.5d + x: 15.5d + y: 3.5d } { icon: "gtceu:dirty_hexafluorosilicic_acid_bucket" @@ -810,8 +819,8 @@ } ] title: "Hexafluorosilicic" - x: 7.0d - y: 4.5d + x: 17.0d + y: 3.5d } { dependencies: ["2B666F65B5F196E6"] @@ -827,8 +836,8 @@ item: "tfg:oxidized_nuclear_residue_dust" type: "item" }] - x: 13.0d - y: 3.0d + x: 17.0d + y: 5.5d } { dependencies: ["5523F60CE095BD0A"] @@ -841,7 +850,7 @@ type: "item" }] x: 17.0d - y: 3.0d + y: 7.0d } { dependencies: [ @@ -886,8 +895,8 @@ type: "checkmark" } ] - x: 10.5d - y: 1.0d + x: 20.0d + y: 5.5d } { dependencies: ["4C0E5C517F0137B9"] @@ -909,7 +918,7 @@ } ] title: "{quests.extreme_voltage.tritiated_water.title}" - x: 8.5d + x: 11.0d y: 10.5d } { @@ -1023,8 +1032,8 @@ } { dependencies: [ - "617CF3335584DC8D" "0CA5B715B76E4A5B" + "24ECDF70031B39C4" ] description: [""] icon: "gtceu:ostrum_harvester" @@ -1042,8 +1051,8 @@ type: "item" } ] - x: 10.5d - y: -2.0d + x: 13.0d + y: 2.5d } { dependencies: ["017019EB38F7A18C"] @@ -1668,10 +1677,10 @@ ] title: "{quests.extreme_voltage.plutonium.title}" x: 17.0d - y: 6.5d + y: 9.0d } { - dependencies: ["236F53188110F6D5"] + dependencies: ["617CF3335584DC8D"] id: "691A36800DC755C1" shape: "octagon" size: 2.0d @@ -1680,8 +1689,8 @@ item: "gtceu:ostrum_linear_accelerator" type: "item" }] - x: 14.0d - y: -2.0d + x: 20.0d + y: 9.0d } { dependencies: ["691A36800DC755C1"] @@ -1700,8 +1709,8 @@ type: "checkmark" } ] - x: 14.0d - y: -0.5d + x: 20.0d + y: 12.5d } { dependencies: ["691A36800DC755C1"] @@ -1720,11 +1729,14 @@ type: "checkmark" } ] - x: 12.5d - y: -0.5d + x: 21.0d + y: 12.5d } { - dependencies: ["691A36800DC755C1"] + dependencies: [ + "691A36800DC755C1" + "3E0ABDFCC0FC6928" + ] icon: "gtceu:dense_ostrum_vapor_bucket" id: "4C29DDE89AE8D6EE" tasks: [ @@ -1740,8 +1752,8 @@ type: "checkmark" } ] - x: 15.5d - y: -0.5d + x: 19.0d + y: 12.5d } { dependencies: ["4F647D6A4949EDF7"] @@ -1773,8 +1785,8 @@ type: "item" } ] - x: 12.5d - y: 1.0d + x: 21.0d + y: 13.5d } { dependencies: ["58264E007C2D7CC6"] @@ -1806,8 +1818,8 @@ type: "item" } ] - x: 14.0d - y: 1.0d + x: 20.0d + y: 13.5d } { dependencies: ["4C29DDE89AE8D6EE"] @@ -1839,8 +1851,8 @@ type: "item" } ] - x: 15.5d - y: 1.0d + x: 19.0d + y: 13.5d } { dependencies: ["3A2E442E4D84C891"] @@ -2007,8 +2019,8 @@ item: "gtceu:ev_large_miner" type: "item" }] - x: 8.5d - y: -4.5d + x: 6.0d + y: -6.0d } { description: [ @@ -2045,6 +2057,17 @@ x: 5.0d y: 8.0d } + { + dependencies: ["236F53188110F6D5"] + id: "5FA09DA68D309548" + tasks: [{ + id: "5043B2468060D522" + item: "gtceu:ostrum_dust" + type: "item" + }] + x: 13.0d + y: 4.0d + } ] subtitle: ["{quests.extreme_voltage.subtitle}"] title: "{quests.extreme_voltage}" diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index fd22a3971..bceed2c49 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1675,9 +1675,16 @@ const registerGTCEURecipes = (event) => { .EUt(GTValues.VA[GTValues.EV]) - // New Alloys For Turbines + // New Alloys event.recipes.gtceu.mixer('tfg:tungsten_bismuth_oxide_composite') + .itemInputs('1x #forge:dusts/iodine', '2x #forge:dusts/ostrum') + .itemOutputs('3x #forge:dusts/ostrum_iodide') + .duration(20 * 12) + .circuit(1) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.mixer('tfg:ostrum_iodide') .itemInputs('2x #forge:dusts/bismuth', 'gtceu:tungsten_dust') .inputFluids(Fluid.of('gtceu:oxygen', 3000)) .itemOutputs('3x tfg:tungsten_bismuth_oxide_composite_dust') diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index c560af1d2..da89da60a 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -1252,13 +1252,14 @@ function registerGTCEuMachineRecipes(event) { event.shaped('gtceu:heat_exchanger', [ 'TUT', 'WZW', - 'TBT' + 'GBG' ], { T: 'gtceu:high_temperature_smelting_casing', W: '#gtceu:circuits/ev', U: 'gtceu:ev_sensor', Z: 'gtceu:ev_machine_hull', - B: 'gtceu:ev_fluid_regulator' + B: 'gtceu:ev_fluid_regulator', + G: '#forge:gears/ostrum_iodide' } ).id('tfg:shaped/heat_exchanger') diff --git a/kubejs/server_scripts/tfg/recipes.nuclear.js b/kubejs/server_scripts/tfg/recipes.nuclear.js index 61e76c7bb..050473c55 100644 --- a/kubejs/server_scripts/tfg/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/recipes.nuclear.js @@ -338,6 +338,7 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.assembler('tfg:tetrafluoroethane_gem') .itemInputs(Item.of('tfg:tetrafluoroethane_gem', 1)) .itemInputs(Item.of('tfg:polycaprolactam_fabric', 16)) + .inputFluids(Fluid.of('gtceu:radon', 5)) .itemOutputs(Item.of('tfg:refrigerant_pellet', 1)) .EUt(GTValues.VA[GTValues.EV]) .duration(20*17) diff --git a/kubejs/startup_scripts/tfg/materials.nuclear.js b/kubejs/startup_scripts/tfg/materials.nuclear.js index 4d1e95956..e0cff0e4f 100644 --- a/kubejs/startup_scripts/tfg/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/materials.nuclear.js @@ -207,6 +207,15 @@ const registerTFGNuclearMaterials = (event) => { .color(0x694c66) .radioactiveHazard(1000) + event.create("ostrum_iodide") + .ingot() + .components('8x ostrum', '4x iodine') + .blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120)) + .iconSet(GTMaterialIconSet.METALLIC) + .flags(GTMaterialFlags.GENERATE_GEAR) + .color(0xc696f2) + .secondaryColor(0x9b99ff) + //#endregion //#region Fuel Pellet