diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 83efe62f8..cbce38594 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -288,7 +288,7 @@ type: "item" }] title: "{quests.extreme_voltage.wood_distillation.title}" - x: -6.0d + x: -5.5d y: -2.5d } { @@ -495,7 +495,7 @@ } ] title: "{quests.extreme_voltage.tungsten_steel.title}" - x: 0.5d + x: 1.5d y: -2.0d } { @@ -1272,14 +1272,24 @@ { dependencies: ["2DEC7AF917AAE4EC"] description: ["{quests.extreme_voltage.gasoline.desc}"] + icon: "gtceu:gasoline_bucket" id: "397546E863E9835E" + optional: true shape: "octagon" size: 1.5d - tasks: [{ - id: "3F040C1D8A8D6676" - item: "gtceu:gasoline_bucket" - type: "item" - }] + tasks: [ + { + id: "3F040C1D8A8D6676" + item: "gtceu:gasoline_bucket" + optional_task: true + type: "item" + } + { + id: "4BE81C925AD3FB91" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] title: "{quests.extreme_voltage.gasoline.title}" x: -7.0d y: -4.5d @@ -2171,6 +2181,68 @@ x: 2.0d y: 4.5d } + { + dependencies: ["43BBB9074608F9B1"] + description: [ + "{quests.extreme_voltage.btx.desc.1}" + "{@pagebreak}" + "{quests.extreme_voltage.btx.desc.2}" + ] + icon: "tfg:btx_fuel_bucket" + id: "601B05D5F3888C74" + optional: true + shape: "octagon" + size: 1.5d + subtitle: "{quests.extreme_voltage.btx.subtitle}" + tasks: [ + { + id: "1EC8E5CE7DD21191" + item: "tfg:btx_fuel_bucket" + optional_task: true + type: "item" + } + { + id: "2A71DF31AAA0CD3D" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + } + ] + title: "{quests.extreme_voltage.btx.title}" + x: -5.5d + y: -4.5d + } + { + dependencies: ["601B05D5F3888C74"] + description: ["{quests.extreme_voltage.btx_catalyser.desc}"] + id: "3EC1D337D9FC3F1B" + optional: true + subtitle: "{quests.extreme_voltage.btx_catalyser.subtitle}" + tasks: [{ + id: "55930B83D1BA6672" + item: "tfg:catalyser_tt_re_zsm" + type: "item" + }] + title: "{quests.extreme_voltage.btx_catalyser.title}" + x: -3.75d + y: -4.5d + } + { + dependencies: ["3EC1D337D9FC3F1B"] + description: [ + "{quests.extreme_voltage.btx_loop.desc.1}" + "{@pagebreak}" + "{quests.extreme_voltage.btx_loop.desc.2}" + ] + id: "38184C7BA01A9B5B" + optional: true + tasks: [{ + id: "39568ED5E30CDC88" + item: "gtceu:rhenium_dust" + type: "item" + }] + x: -5.5d + y: -6.25d + } ] subtitle: ["{quests.extreme_voltage.subtitle}"] title: "{quests.extreme_voltage}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index adb493891..6ed1fe1ac 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1207,7 +1207,7 @@ "material.tfg.reformed_aromatic_feedstock": "Reformed Aromatic Feedstock", "material.tfg.reformate_gas": "Reformate Gas", "material.tfg.cracker_off_gas": "Cracked Reformate Off-Gas", - "material.tfg.btx_fuel": "BTX Gas", + "material.tfg.btx_fuel": "BTX Fuel", "material.tfg.critical_steam": "Critical Steam", "material.tfg.americium_241": "Americium-241", "material.tfg.californium_252": "Californium-252", diff --git a/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js b/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js index 0449c37e5..d960d60b3 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.early_gas.js @@ -289,14 +289,14 @@ function registerTFGEarlyGasRecipes(event) { event.recipes.gtceu.distillation_tower('tfg:methanol_distil_propylene') .inputFluids(Fluid.of('gtceu:methanol', 6000)) - .outputFluids(Fluid.of('gtceu:hydrogen', 10000), Fluid.of('gtceu:oxygen', 6000), Fluid.of('gtceu:methane', 1000), Fluid.of('gtceu:ethylene', 1000), Fluid.of('tfg:propylene', 1000)) + .outputFluids(Fluid.of('gtceu:hydrogen', 10000), Fluid.of('gtceu:oxygen', 6000), Fluid.of('gtceu:methane', 1000), Fluid.of('gtceu:ethylene', 1000), Fluid.of('gtceu:propene', 1000)) .duration(20*30) .EUt(GTValues.VA[GTValues.HV]) event.recipes.gtceu.cracker('tfg:crude_mixed_gas') .itemInputs(Item.of('tfg:catalyser_pt_re_zsm')) .inputFluids(Fluid.of('tfg:reformate_gas', 8000)) - .inputFluids(Fluid.of('tfg:propylene', 2000)) + .inputFluids(Fluid.of('gtceu:propene', 2000)) .outputFluids(Fluid.of('tfg:crude_mixed_gas', 10000)) .duration(20*240) .EUt(GTValues.VA[GTValues.LV]) @@ -342,9 +342,9 @@ function registerTFGEarlyGasRecipes(event) { event.recipes.gtceu.mixer('tfg:aciditic_waste') .itemInputs(Item.of('gtceu:reinforced_epoxy_resin_plate', 1)) - .inputFluids(Fluid.of('tfg:metal_rich_solution', 100), Fluid.of('gtceu:glue', 100)) - .outputFluids(Fluid.of('tfg:aciditic_waste', 100)) - .itemOutputs(Item.of('tfg:loaded_resin', 1)) + .inputFluids(Fluid.of('tfg:metal_rich_solution', 200), Fluid.of('gtceu:glue', 200)) + .outputFluids(Fluid.of('tfg:aciditic_waste', 200)) + .itemOutputs(Item.of('tfg:loaded_resin', 2)) .duration(20*15) .EUt(GTValues.VA[GTValues.ULV])