illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First fixes for Mars Fission (#1978)

Browse source 
* First fixes for Mars Fission

* Fix ShapeInfo
This commit is contained in:
TomPlop 2025-10-07 17:43:16 -04:00 • committed by GitHub
parent f6e4935488
commit fd182dfddd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kubejs/server_scripts/tfg/recipes.nuclear.js
View file

@ -19,7 +19,7 @@ function registerTFGNuclearRecipes(event) {
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.assembler('tfg:fuel_holder')
.itemInputs('gtceu:ev_machine_hull', '4x gtceu:uranium_triplatinum_single_wire', '4x gtceu:ev_robot_arm', '4x gtceu:titanium_gear', '2x #gtceu:circuits/ev')
.itemInputs('gtceu:ev_machine_hull', '4x gtceu:ev_robot_arm', '4x gtceu:titanium_gear', '2x #gtceu:circuits/ev')
.itemOutputs('deafission:fuel_holder')
.duration(20*30)
.circuit(1)
@ -36,7 +36,7 @@ function registerTFGNuclearRecipes(event) {
.EUt(GTValues.V[GTValues.HV])
event.recipes.gtceu.nuclear_fuel_factory('tfg:uranium_pellet')
.inputFluids(Fluid.of('gtceu:uranium_waste', 10000))
.inputFluids(Fluid.of('gtceu:radioactive_waste', 10000))
.itemInputs('16x #forge:rods/uranium_235', '32x #forge:rods/uranium', '32x #forge:rods/uranium',
'32x #forge:rods/uranium', '32x #forge:rods/uranium', 'tfg:empty_rod')
.itemOutputs('tfg:uranium_rod')
@ -122,7 +122,7 @@ function registerTFGNuclearRecipes(event) {
event.recipes.gtceu.gas_pressurizer('nuclear_residue')
.inputFluids(Fluid.of('gtceu:martian_sludge', 1000))
.inputFluids(Fluid.of('gtceu:formamide', 1000))
.inputFluids(Fluid.of('gtceu:radioactive_waste', 1000))
.inputFluids(Fluid.of('gtceu:uranium_waste', 1000))
.outputFluids(Fluid.of('gtceu:radon', 1000))
.itemOutputs('#forge:dusts/nuclear_residue')
.duration(20*10)
@ -212,7 +212,7 @@ function registerTFGNuclearRecipes(event) {
event.recipes.deafission.fission_reactor_fuel('tfg:thorium')
.itemInputs(Item.of('tfg:thorium_rod'))
.outputFluids(Fluid.of('gtceu:uranium_waste', 2500))
.outputFluids(Fluid.of('gtceu:radioactive_waste', 2500))
.itemOutputs(Item.of('tfg:empty_rod'))
.dimension('ad_astra:mars')
.hideDuration(true);
@ -239,7 +239,7 @@ function registerTFGNuclearRecipes(event) {
event.recipes.deafission.fission_reactor_fuel('tfg:uranium')
.itemInputs(Item.of('tfg:uranium_rod'))
.outputFluids(Fluid.of('gtceu:radioactive_waste', 50000))
.outputFluids(Fluid.of('gtceu:uranium_waste', 50000))
.itemOutputs(Item.of('tfg:empty_rod'))
.hideDuration(true);
@ -264,7 +264,7 @@ function registerTFGNuclearRecipes(event) {
event.recipes.deafission.fission_reactor_fuel('tfg:plutonium')
.itemInputs(Item.of('tfg:plutonium_rod'))
.outputFluids(Fluid.of('gtceu:tritiated_water', 5000))
.outputFluids(Fluid.of('gtceu:tritiated_water', 5184))
.itemOutputs(Item.of('tfg:empty_rod'))
.hideDuration(true);

28
kubejs/startup_scripts/gtceu/machines.js
View file

@ -387,11 +387,11 @@ const registerGTCEuMachines = (event) => {
.appearanceBlock(() => Block.getBlock('gtceu:nonconducting_casing'))
.pattern(definition => FactoryBlockPattern.start()
.aisle(' ' ,'A A', 'AAAAA', 'ACCCA', 'AACAA', ' AAA ')
.aisle(' G ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ')
.aisle(' GGG ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ')
.aisle('GGGGG' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ')
.aisle(' GGG ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ')
.aisle(' G ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ')
.aisle(' G ' ,' ', 'BBBBB', 'B###B', 'BB#BB', ' BFB ')
.aisle(' GGG ' ,' ', 'ADDDA', 'D###D', 'A###A', ' BFB ')
.aisle('GGGGG' ,' ', 'ADDDA', 'D###D', 'A###A', ' BFB ')
.aisle(' GGG ' ,' ', 'ADDDA', 'D###D', 'A###A', ' BFB ')
.aisle(' G ' ,' ', 'BBBBB', 'B###B', 'BB#BB', ' BFB ')
.aisle(' ' ,'A A', 'AAAAA', 'ACXCA', 'AACAA', ' AAA ')
.where('X', Predicates.controller(Predicates.blocks(definition.get())))
.where('A', Predicates.blocks('gtceu:secure_maceration_casing'))
@ -422,11 +422,11 @@ const registerGTCEuMachines = (event) => {
.appearanceBlock(() => Block.getBlock('gtceu:nonconducting_casing'))
.pattern(definition => FactoryBlockPattern.start()
.aisle('A A', 'AAAAA', 'ACCCA', 'AAEAA', ' AAA ')
.aisle(' ', 'BBBBB', 'B B', 'BB BB', ' BFB ')
.aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ')
.aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ')
.aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ')
.aisle(' ', 'BBBBB', 'B B', 'BB BB', ' BFB ')
.aisle(' ', 'BBBBB', 'B###B', 'BB#BB', ' BFB ')
.aisle(' ', 'ADDDA', 'D###D', 'A###A', ' BFB ')
.aisle(' ', 'ADDDA', 'D###D', 'A###A', ' BFB ')
.aisle(' ', 'ADDDA', 'D###D', 'A###A', ' BFB ')
.aisle(' ', 'BBBBB', 'B###B', 'BB#BB', ' BFB ')
.aisle('A A', 'AAAAA', 'ACXCA', 'AACAA', ' AAA ')
.where('X', Predicates.controller(Predicates.blocks(definition.get())))
.where('A', Predicates.blocks('tfg:casings/machine_casing_iron_desh'))
@ -459,7 +459,7 @@ const registerGTCEuMachines = (event) => {
.aisle('BAAAAAAAA', 'B#######D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' )
.aisle('AAAAAAAAA', 'A#######D', 'BB###BBAA', ' C###C ', ' BHHHB ' )
.aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' )
.aisle('A#####AFA', 'A#####AXA', 'AAAAAAAFA', ' ', ' ' )
.aisle('A AFA', 'A AXA', 'AAAAAAAFA', ' ', ' ' )
.where('X', Predicates.controller(Predicates.blocks(definition.get())))
.where('A', Predicates.blocks('tfg:casings/machine_casing_mars')
.or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2)))
@ -467,7 +467,8 @@ const registerGTCEuMachines = (event) => {
.where('C', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake'))
.where('D', Predicates.blocks('gtceu:heat_vent'))
.where('E', Predicates.blocks('tfg:casings/machine_casing_mars')
.or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(6)))
.or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(6))
.or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(6)))
.where('F', Predicates.blocks('tfg:casings/machine_casing_mars')
.or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1)))
.where('H', Predicates.blocks('tfg:casings/machine_casing_mars')
@ -481,7 +482,7 @@ const registerGTCEuMachines = (event) => {
.aisle('KKAAAAAAA', 'AAAAAAAAA', 'AAAAAAAAA', ' ', ' ' )
.aisle('BAAAAAAAA', 'B D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' )
.aisle('AAAAAAAAA', 'A D', 'BB BBAA', ' C C ', ' BIAHB ' )
.aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' )
.aisle('BEBEBEAAA', 'BEBFBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' )
.aisle('A AMA', 'A AXA', 'AAAAAAAAA', ' ', ' ' )
.where('X', controller, Direction.SOUTH)
.where('A', Block.getBlock('tfg:casings/machine_casing_mars'))
@ -489,6 +490,7 @@ const registerGTCEuMachines = (event) => {
.where('C', Block.getBlock('tfg:casings/machine_casing_vacuum_engine_intake'))
.where('D', Block.getBlock('gtceu:heat_vent'))
.where('E', GTMachines.FLUID_IMPORT_HATCH[GTValues.EV], Direction.SOUTH)
.where('F', GTMachines.ITEM_IMPORT_BUS[GTValues.EV], Direction.SOUTH)
.where('H', GTMachines.ITEM_EXPORT_BUS[GTValues.EV], Direction.UP)
.where('I', GTMachines.FLUID_EXPORT_HATCH[GTValues.EV], Direction.UP)
.where('M', GTMachines.AUTO_MAINTENANCE_HATCH, Direction.SOUTH)