From 5b462bbb28b8dc7c7bfb174880c553874ae1cae2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Jun 2025 02:13:26 +0100 Subject: [PATCH] compressed airs! --- kubejs/server_scripts/ad_astra/recipes.js | 8 ++--- kubejs/server_scripts/tfg/recipes.space.js | 37 ++++++++++++++++++++++ kubejs/server_scripts/tfg/tags.js | 6 ++++ kubejs/startup_scripts/tfg/materials.js | 31 ++++++++++++++++-- 4 files changed, 76 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 8f63e5fcd..54c452043 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -383,7 +383,7 @@ const registerAdAstraRecipes = (event) => { ingredient: { fluid: 'gtceu:air' }, - millibuckets: 2 + millibuckets: 100 }, result: { fluid: 'ad_astra:oxygen', @@ -397,15 +397,15 @@ const registerAdAstraRecipes = (event) => { energy: 30, input: { ingredient: { - fluid: 'gtceu:oxygen' + tag: 'tfg:breathable_compressed_air' }, millibuckets: 1 }, result: { fluid: 'ad_astra:oxygen', - millibuckets: 100 + millibuckets: 200 } - }).id('ad_astra:oxygen_loading/air_from_oxygen_gas') + }).id('ad_astra:oxygen_loading/air_from_compressed') //#endregion diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index 84e2c70df..047f7fa95 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -192,4 +192,41 @@ function registerTFGSpaceRecipes(event) { .outputFluids(Fluid.of('gtceu:biomass', 20)) .duration(50) .EUt(3) + + // Space suit gases + + event.recipes.gtceu.compressor('compressed_nitrox') + .inputFluids(Fluid.of('gtceu:nitrogen', 8000), Fluid.of('gtceu:oxygen', 2000)) + .outputFluids(Fluid.of('tfg:compressed_nitrox', 1000)) + .circuit(1) + .duration(100) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.compressor('compressed_heliox') + .inputFluids(Fluid.of('gtceu:helium', 8000), Fluid.of('gtceu:oxygen', 2000)) + .outputFluids(Fluid.of('tfg:compressed_heliox', 1000)) + .circuit(1) + .duration(100) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.compressor('compressed_heliox_3') + .inputFluids(Fluid.of('gtceu:helium_3', 8000), Fluid.of('gtceu:oxygen', 2000)) + .outputFluids(Fluid.of('tfg:compressed_heliox_3', 1000)) + .circuit(1) + .duration(100) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.compressor('compressed_trimix') + .inputFluids(Fluid.of('gtceu:nitrogen', 5000), Fluid.of('gtceu:oxygen', 3000), Fluid.of('gtceu:helium', 2000)) + .outputFluids(Fluid.of('tfg:compressed_trimix', 1000)) + .circuit(2) + .duration(100) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.compressor('compressed_trimix_3') + .inputFluids(Fluid.of('gtceu:nitrogen', 5000), Fluid.of('gtceu:oxygen', 3000), Fluid.of('gtceu:helium_3', 2000)) + .outputFluids(Fluid.of('tfg:compressed_trimix_3', 1000)) + .circuit(2) + .duration(100) + .EUt(GTValues.VA[GTValues.HV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 81073ba17..112abc34e 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -306,6 +306,12 @@ const registerTFGFluidTags = (event) => { event.add('tfc:usable_in_wooden_bucket', 'tfg:conifer_pitch') event.add('tfc:usable_in_red_steel_bucket', 'tfg:conifer_pitch') event.add('tfc:usable_in_blue_steel_bucket', 'tfg:conifer_pitch') + + event.add('tfg:breathable_compressed_air', 'tfg:compressed_nitrox') + event.add('tfg:breathable_compressed_air', 'tfg:compressed_heliox') + event.add('tfg:breathable_compressed_air', 'tfg:compressed_heliox_3') + event.add('tfg:breathable_compressed_air', 'tfg:compressed_trimix') + event.add('tfg:breathable_compressed_air', 'tfg:compressed_trimix_3') } diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index c4a724a3f..dab9032c9 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -50,8 +50,35 @@ const registerTFGMaterials = (event) => { .blastTemp(1760, 'low', 120, 1200) event.create('vitrified_asbestos') - .dust() + .dust() .fluid() .iconSet('glass') - .color(0xcccccc) + .color(0xcccccc) + + // Space suit gases (these all add up to 10B of components = 1B of space suit gas) + + event.create('tfg:compressed_nitrox') + .gas() + .components('8x nitrogen', '2x oxygen') + .color(0xaef5ef) + + event.create('tfg:compressed_heliox') + .gas() + .components('8x helium', '2x oxygen') + .color(0xf5eeb3) + + event.create('tfg:compressed_heliox_3') + .gas() + .components('8x helium_3', '2x oxygen') + .color(0xf5ea90) + + event.create('tfg:compressed_trimix') + .gas() + .components('5x nitrogen', '3x oxygen', '2x helium') + .color(0xc3fab9) + + event.create('tfg:compressed_trimix_3') + .gas() + .components('5x nitrogen', '3x oxygen', '2x helium_3') + .color(0xa3ed95) }