From ac99b9db8775c7de3d76b9b39da862e17736f1d5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 18:30:27 +0100 Subject: [PATCH] Solar tweaks (#1678) * solar tweaks * langs --- CHANGELOG.md | 1 + kubejs/assets/tfg/lang/en_us.json | 2 +- kubejs/assets/tfg/lang/uk_ua.json | 2 +- kubejs/data/ad_astra/planets/earth.json | 2 +- kubejs/data/ad_astra/planets/mars.json | 2 +- kubejs/data/ad_astra/planets/moon.json | 2 +- kubejs/data/ad_astra/planets/venus.json | 2 +- .../gregtech/recipes.machines.js | 49 ++++++++++++++----- kubejs/startup_scripts/gtceu/recipe_types.js | 2 +- 9 files changed, 46 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f00a254cf..8f4c4e0cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Removed the mod that was causing placed entities to sometimes not spawn - Removed energy P2P (#1661) @TomPlop @BlueBoat29 - Removed GT bedrock miners, replaced with a new system for Moon infinites (#1569) @TomPlop +- Buffed Large Solar Panel MK I so now it has a consistent EV-generating recipe, but halved the output of ad astra solar panels on the moon @TomPlop @Pyritie ### Changes - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 22f9adf86..675ede7fa 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -963,7 +963,7 @@ "tfg.tooltip.support.tier2": "§717 x 9 x 17", "tfg.tooltip.support.tier3": "§733 x 13 x 33", "tfg.tooltip.vessels": "§cMax: 3024mB", - "tfg.tooltip.solar_panel.single": "Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.single": "Produces §6128 FE/t§r (32 EU/t) on the §6moon§r during the §6day§r", "tfg.tooltip.solar_panel.large_tier1": "Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r", "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index cfb3c8cda..90382694b 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -956,7 +956,7 @@ "tfg.tooltip.support.tier2": "§717 x 9 x 17", "tfg.tooltip.support.tier3": "§733 x 13 x 33", "tfg.tooltip.vessels": "§cМакс: 3024mB", - "tfg.tooltip.solar_panel.single": "Виробляє §6256 FE/t§r (64 EU/t) на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.solar_panel.single": "Виробляє §6128 FE/t§r (32 EU/t) на §6Місяці§r протягом §6дня§r", "tfg.tooltip.solar_panel.large_tier1": "Гігантська структура, що виробляє від §61024 до 4096 EU/t§r на §6Місяці§r протягом §6дня§r", "tfg.tooltip.solar_panel.large_tier2": "Гігантська структура, що виробляє від §64096 до 16384 EU/t§r на §6Місяці§r протягом §6дня§r", "tfg.tooltip.solar_panel.large_tier3": "Гігантська структура, що виробляє від §616384 до 65536 EU/t§r на §6Місяці§r протягом §6дня§r", diff --git a/kubejs/data/ad_astra/planets/earth.json b/kubejs/data/ad_astra/planets/earth.json index 72bb5ad14..f78621687 100644 --- a/kubejs/data/ad_astra/planets/earth.json +++ b/kubejs/data/ad_astra/planets/earth.json @@ -3,7 +3,7 @@ "gravity": 9.807, "orbit": "ad_astra:earth_orbit", "oxygen": true, - "solar_power": 32, + "solar_power": 16, "solar_system": "ad_astra:solar_system", "temperature": 15, "tier": 1 diff --git a/kubejs/data/ad_astra/planets/mars.json b/kubejs/data/ad_astra/planets/mars.json index 37c5c5f50..bd5e4a25d 100644 --- a/kubejs/data/ad_astra/planets/mars.json +++ b/kubejs/data/ad_astra/planets/mars.json @@ -3,7 +3,7 @@ "gravity": 3.72076, "orbit": "ad_astra:mars_orbit", "oxygen": false, - "solar_power": 32, + "solar_power": 16, "solar_system": "ad_astra:solar_system", "temperature": -65, "tier": 2 diff --git a/kubejs/data/ad_astra/planets/moon.json b/kubejs/data/ad_astra/planets/moon.json index 0205ab90e..c8f638877 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": 256, + "solar_power": 128, "solar_system": "ad_astra:solar_system", "temperature": -173, "tier": 1 diff --git a/kubejs/data/ad_astra/planets/venus.json b/kubejs/data/ad_astra/planets/venus.json index ed182032e..05d66842f 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": 32, + "solar_power": 16, "solar_system": "ad_astra:solar_system", "temperature": 465, "tier": 3 diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 0131d3b0e..e65392484 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -1040,33 +1040,36 @@ function registerGTCEuMachineRecipes(event) { // Solar T1 - event.recipes.gtceu.large_solar_panel('solar_panel_t1_cheap') - .notConsumable('tfg:photo_cell_t1') + event.recipes.gtceu.large_solar_panel('solar_panel_t1_emergency') + .chancedInput('tfg:photo_cell_t1', 100, 0) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') - .EUt(-(GTValues.V[GTValues.HV]), 2) + .EUt(-((GTValues.V[GTValues.HV])), 2) .circuit(1) event.recipes.gtceu.large_solar_panel('solar_panel_t1') - .chancedInput('tfg:photo_cell_t1', 500, 0) + .notConsumable('tfg:photo_cell_t1') + .perTick(true) + .chancedFluidInput('tfg:compressed_trimix_3 4', 5000, 0) + .perTick(false) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') - .EUt(-((GTValues.V[GTValues.EV])), 2) + .EUt(-(GTValues.V[GTValues.EV]), 2) .circuit(2) // Solar T2 - event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_cheap') - .chancedInput('ad_astra:photovoltaic_etrium_cell', 500, 0) + event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_emergency') + .chancedInput('ad_astra:photovoltaic_etrium_cell', 100, 0) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') .EUt(-(GTValues.V[GTValues.EV]), 2) .circuit(1) - event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2') + event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_strong') .notConsumable('ad_astra:photovoltaic_etrium_cell') .perTick(true) .chancedFluidInput('tfg:solar_coolant 10', 5000, 0) @@ -1079,17 +1082,28 @@ function registerGTCEuMachineRecipes(event) { .EUt(-(GTValues.V[GTValues.IV]), 2) .circuit(2) + event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_cheap') + .notConsumable('ad_astra:photovoltaic_etrium_cell') + .perTick(true) + .inputFluids('tfg:compressed_trimix_3 1') + .perTick(false) + .duration(20 * 20) + .daytime(false) + .dimension('ad_astra:moon') + .EUt(-(GTValues.V[GTValues.EV]), 2) + .circuit(3) + // Solar T3 - event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_cheap') - .chancedInput('ad_astra:photovoltaic_vesnium_cell', 500, 0) + event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_emergency') + .chancedInput('ad_astra:photovoltaic_vesnium_cell', 100, 0) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') .EUt(-(GTValues.V[GTValues.IV]), 2) .circuit(1) - event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3') + event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_strong') .notConsumable('ad_astra:photovoltaic_vesnium_cell') .perTick(true) .chancedFluidInput('tfg:solar_coolant_tier2 10', 5000, 0) @@ -1102,6 +1116,19 @@ function registerGTCEuMachineRecipes(event) { .EUt(-(GTValues.V[GTValues.LuV]), 2) .circuit(2) + event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_cheap') + .notConsumable('ad_astra:photovoltaic_vesnium_cell') + .perTick(true) + .chancedFluidInput('tfg:solar_coolant 10', 5000, 0) + .inputFluids('tfg:cryogenized_fluix 4') + .outputFluids('tfg:fluix 1') + .perTick(false) + .duration(20 * 20) + .daytime(false) + .dimension('ad_astra:moon') + .EUt(-(GTValues.V[GTValues.IV]), 2) + .circuit(2) + //#endregion //#region Mars Ore Line diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 94554dc48..f7afe396e 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -23,7 +23,7 @@ const registerGTCEuRecipeTypes = (event) => { event.create('large_solar_panel') .category('generator') .setEUIO('out') - .setMaxIOSize(2, 0, 0, 0) + .setMaxIOSize(2, 0, 2, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING)