From d80c5a0e84b5f857b2f88df71eca4d61d5da7c82 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 6 Jul 2025 00:49:29 +0100 Subject: [PATCH] tweaks and balances after playtesting a bit --- kubejs/data/ad_astra/planets/earth_orbit.json | 2 +- kubejs/data/ad_astra/planets/mars_orbit.json | 2 +- kubejs/data/ad_astra/planets/moon.json | 2 +- kubejs/data/ad_astra/planets/moon_orbit.json | 2 +- kubejs/data/ad_astra/planets/venus.json | 2 +- kubejs/data/ad_astra/planets/venus_orbit.json | 2 +- .../blocks/lunar_chorus_flower.json | 2 +- kubejs/server_scripts/ad_astra/recipes.js | 6 ++-- kubejs/server_scripts/gregtech/data.js | 14 ++++++++++ kubejs/server_scripts/main_server_script.js | 4 +++ kubejs/server_scripts/tfg/recipes.space.js | 28 +++++++++++++------ .../server_scripts/tfg/recipes.stone_dusts.js | 24 ++++++++-------- kubejs/server_scripts/tfg/tags.js | 1 - 13 files changed, 59 insertions(+), 32 deletions(-) diff --git a/kubejs/data/ad_astra/planets/earth_orbit.json b/kubejs/data/ad_astra/planets/earth_orbit.json index fffc3dfaf..70568170e 100644 --- a/kubejs/data/ad_astra/planets/earth_orbit.json +++ b/kubejs/data/ad_astra/planets/earth_orbit.json @@ -2,7 +2,7 @@ "dimension": "ad_astra:earth_orbit", "gravity": 0.0, "oxygen": false, - "solar_power": 128, + "solar_power": 256, "solar_system": "ad_astra:solar_system", "temperature": -270, "tier": 1 diff --git a/kubejs/data/ad_astra/planets/mars_orbit.json b/kubejs/data/ad_astra/planets/mars_orbit.json index 6f4b02e20..0c46e8d28 100644 --- a/kubejs/data/ad_astra/planets/mars_orbit.json +++ b/kubejs/data/ad_astra/planets/mars_orbit.json @@ -2,7 +2,7 @@ "dimension": "ad_astra:mars_orbit", "gravity": 0.0, "oxygen": false, - "solar_power": 64, + "solar_power": 128, "solar_system": "ad_astra:solar_system", "temperature": -270, "tier": 2 diff --git a/kubejs/data/ad_astra/planets/moon.json b/kubejs/data/ad_astra/planets/moon.json index c8f638877..0205ab90e 100644 --- a/kubejs/data/ad_astra/planets/moon.json +++ b/kubejs/data/ad_astra/planets/moon.json @@ -3,7 +3,7 @@ "gravity": 1.622, "orbit": "ad_astra:moon_orbit", "oxygen": false, - "solar_power": 128, + "solar_power": 256, "solar_system": "ad_astra:solar_system", "temperature": -173, "tier": 1 diff --git a/kubejs/data/ad_astra/planets/moon_orbit.json b/kubejs/data/ad_astra/planets/moon_orbit.json index ba3d02d0f..8d99b8202 100644 --- a/kubejs/data/ad_astra/planets/moon_orbit.json +++ b/kubejs/data/ad_astra/planets/moon_orbit.json @@ -2,7 +2,7 @@ "dimension": "ad_astra:moon_orbit", "gravity": 0.0, "oxygen": false, - "solar_power": 128, + "solar_power": 256, "solar_system": "ad_astra:solar_system", "temperature": -270, "tier": 1 diff --git a/kubejs/data/ad_astra/planets/venus.json b/kubejs/data/ad_astra/planets/venus.json index ac2dac01e..ed182032e 100644 --- a/kubejs/data/ad_astra/planets/venus.json +++ b/kubejs/data/ad_astra/planets/venus.json @@ -3,7 +3,7 @@ "gravity": 8.87, "orbit": "ad_astra:venus_orbit", "oxygen": false, - "solar_power": 40, + "solar_power": 32, "solar_system": "ad_astra:solar_system", "temperature": 465, "tier": 3 diff --git a/kubejs/data/ad_astra/planets/venus_orbit.json b/kubejs/data/ad_astra/planets/venus_orbit.json index 736f8626a..75f26f72c 100644 --- a/kubejs/data/ad_astra/planets/venus_orbit.json +++ b/kubejs/data/ad_astra/planets/venus_orbit.json @@ -2,7 +2,7 @@ "dimension": "ad_astra:glacio_orbit", "gravity": 0.0, "oxygen": false, - "solar_power": 128, + "solar_power": 512, "solar_system": "ad_astra:solar_system", "temperature": -270, "tier": 3 diff --git a/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json b/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json index 160d9a686..8aa73cbbc 100644 --- a/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json +++ b/kubejs/data/tfg/loot_tables/blocks/lunar_chorus_flower.json @@ -41,7 +41,7 @@ "conditions": [ { "condition": "minecraft:random_chance", - "chance": 0.1 + "chance": 0.2 } ] } diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 20b69d3ac..090118219 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -390,11 +390,11 @@ const registerAdAstraRecipes = (event) => { ingredient: { fluid: 'gtceu:air' }, - millibuckets: 100 + millibuckets: 1 }, result: { fluid: 'ad_astra:oxygen', - millibuckets: 100 + millibuckets: 1 } }).id('ad_astra:oxygen_loading/air_from_air') @@ -411,7 +411,7 @@ const registerAdAstraRecipes = (event) => { }, result: { fluid: 'ad_astra:oxygen', - millibuckets: 200 + millibuckets: 600 } }).id(`ad_astra:oxygen_loading/air_from_${x.split(':')[1]}`) }) diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index 607f78bda..086386c42 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -183,4 +183,18 @@ const registerGTCEUBedrockOreVeins = (event) => { .material(GTMaterials.Pollucite, 1) .dimensions('ad_astra:moon') }) +} + +function registerGTCEUBedrockFluidVeins(event) { + + event.add('tfg:moon_helium_3', vein => { + vein.dimensions('ad_astra:moon') + vein.fluid(() => Fluid.of('gtceu:helium_3').fluid) + vein.weight(1000) + vein.minimumYield(200) + vein.maximumYield(400) + vein.depletionAmount(1) + vein.depletionChance(1) + vein.depletedYield(200) + }) } \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index df491c474..5b1d48c6e 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -181,6 +181,10 @@ GTCEuServerEvents.bedrockOreVeins(event => { registerGTCEUBedrockOreVeins(event) }) +GTCEuServerEvents.fluidVeins(event => { + registerGTCEUBedrockFluidVeins(event) +}) + /** * Событие регистрации рецептов. * Срабатывает после инициализации датапаков и тегов. diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index 622d61231..f579b56e0 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -54,7 +54,6 @@ function registerTFGSpaceRecipes(event) { .duration(20) .EUt(GTValues.VHA[GTValues.ULV]) .addDataString("fluidA", "minecraft:water") - .addDataString("fluidB", "minecraft:water") .outputFluids(Fluid.of("minecraft:water", 1000)) event.recipes.gtceu.aqueous_accumulator('water_nether') @@ -63,7 +62,6 @@ function registerTFGSpaceRecipes(event) { .duration(20) .EUt(GTValues.VHA[GTValues.ULV]) .addDataString("fluidA", "minecraft:water") - .addDataString("fluidB", "minecraft:water") .outputFluids(Fluid.of("minecraft:water", 1000)) event.recipes.gtceu.aqueous_accumulator('water_moon') @@ -72,7 +70,6 @@ function registerTFGSpaceRecipes(event) { .duration(20*5) .EUt(GTValues.VHA[GTValues.MV]) .addDataString("fluidA", "minecraft:water") - .addDataString("fluidB", "minecraft:water") .outputFluids(Fluid.of("minecraft:water", 1000)) event.recipes.gtceu.aqueous_accumulator('sea_water_overworld') @@ -81,7 +78,6 @@ function registerTFGSpaceRecipes(event) { .duration(20) .EUt(GTValues.VA[GTValues.ULV]) .addDataString("fluidA", "tfc:salt_water") - .addDataString("fluidB", "tfc:salt_water") .outputFluids(Fluid.of("tfc:salt_water", 1000)) event.recipes.gtceu.aqueous_accumulator('sea_water_nether') @@ -90,7 +86,14 @@ function registerTFGSpaceRecipes(event) { .duration(20) .EUt(GTValues.VA[GTValues.ULV]) .addDataString("fluidA", "tfc:salt_water") - .addDataString("fluidB", "tfc:salt_water") + .outputFluids(Fluid.of("tfc:salt_water", 1000)) + + event.recipes.gtceu.aqueous_accumulator('sea_water_moon') + .circuit(aaCircuit++) + .dimension('ad_astra:moon') + .duration(20) + .EUt(GTValues.VA[GTValues.ULV]) + .addDataString("fluidA", "tfc:salt_water") .outputFluids(Fluid.of("tfc:salt_water", 1000)) event.recipes.gtceu.aqueous_accumulator('lava_overworld') @@ -99,7 +102,6 @@ function registerTFGSpaceRecipes(event) { .duration(20*15) .EUt(GTValues.VHA[GTValues.HV]) .addDataString("fluidA", "minecraft:lava") - .addDataString("fluidB", "minecraft:lava") .outputFluids(Fluid.of("minecraft:lava", 1000)) event.recipes.gtceu.aqueous_accumulator('lava_nether') @@ -108,7 +110,6 @@ function registerTFGSpaceRecipes(event) { .duration(20*15) .EUt(GTValues.VHA[GTValues.HV]) .addDataString("fluidA", "minecraft:lava") - .addDataString("fluidB", "minecraft:lava") .outputFluids(Fluid.of("minecraft:lava", 1000)) // Plants @@ -130,16 +131,25 @@ function registerTFGSpaceRecipes(event) { .itemOutputs('32x minecraft:chorus_fruit') .chancedOutput('8x tfg:lunar_chorus_flower', 8500, 1000) .chancedOutput('8x tfg:lunar_chorus_flower', 6000, 1000) - .duration(12000) // 30 mins + .duration(12000) // 10 mins .circuit(2) .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') + // Replace the built-in greg one to add a circuit + event.recipes.gtceu.fermenter('fermented_biomass') + .inputFluids(Fluid.of('gtceu:biomass', 100)) + .outputFluids(Fluid.of('gtceu:fermented_biomass', 100)) + .circuit(1) + .duration(150) + .EUt(2) + event.recipes.gtceu.fermenter('tfg:chorus') .itemInputs('minecraft:chorus_fruit') .inputFluids(Fluid.of('gtceu:biomass', 20)) .chancedOutput('ae2:ender_dust', 100, 100) - .outputFluids(Fluid.of('gtceu:nitrogen', 100)) + .outputFluids(Fluid.of('gtceu:nitrogen', 1000)) + .circuit(2) .duration(5 * 20) .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') diff --git a/kubejs/server_scripts/tfg/recipes.stone_dusts.js b/kubejs/server_scripts/tfg/recipes.stone_dusts.js index 9a4252e35..984ec0791 100644 --- a/kubejs/server_scripts/tfg/recipes.stone_dusts.js +++ b/kubejs/server_scripts/tfg/recipes.stone_dusts.js @@ -213,30 +213,30 @@ function registerTFGStoneDustRecipes(event) { event.recipes.gtceu.centrifuge('moon_stone_dust_separation') .EUt(GTValues.VA[GTValues.MV]) - .duration(480) + .duration(10 * 20) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('moon_stone'), 1)) .chancedOutput('ae2:sky_dust', 5000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Ilmenite, 1), 4500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnetite, 1), 2500, 500) - .outputFluids(Fluid.of('gtceu:helium_3', 50)) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Ilmenite, 1), 1000, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Magnetite, 1), 2000, 500) + .outputFluids(Fluid.of('gtceu:helium_3', 200)) event.recipes.gtceu.centrifuge('moon_deepslate_dust_separation') .EUt(GTValues.VA[GTValues.MV]) - .duration(480) + .duration(10 * 20) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('moon_deepslate'), 1)) .chancedOutput('ae2:sky_dust', 5000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 5500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Olivine, 1), 3500, 500) - .outputFluids(Fluid.of('gtceu:helium_3', 50)) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Calcium, 1), 2000, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Olivine, 1), 1500, 500) + .outputFluids(Fluid.of('gtceu:helium_3', 200)) event.recipes.gtceu.centrifuge('glacio_stone_dust_separation') .EUt(GTValues.VA[GTValues.MV]) - .duration(480) + .duration(10 * 20) .itemInputs(ChemicalHelper.get(TagPrefix.dust, TFGHelpers.getMaterial('glacio_stone'), 1)) .chancedOutput('ae2:sky_dust', 3000, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Sodium, 1), 7500, 500) - .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Potassium, 1), 7500, 500) - .outputFluids(Fluid.of('gtceu:oxygen', 15), Fluid.of('gtceu:helium_3', 70)) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Sodium, 1), 4000, 500) + .chancedOutput(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Potassium, 1), 4000, 500) + .outputFluids(Fluid.of('gtceu:oxygen', 50), Fluid.of('gtceu:helium_3', 300)) // AE2 diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 4b39bdb84..caa0665da 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -199,7 +199,6 @@ const registerTFGItemTags = (event) => { // #region Space blocks event.add('tfg:moon_plants', 'tfg:lunar_roots') event.add('tfg:moon_plants', 'tfg:lunar_sprouts') - event.add('tfg:moon_plants', 'tfg:lunar_chorus_flower') // #endregion // #region 0.7.19 -> 0.9 conversion