From 62ba5dbf162983eb6560ed6406dbc71ebe0b8579 Mon Sep 17 00:00:00 2001 From: Xefyr0 <78383477+Xefyr0@users.noreply.github.com> Date: Wed, 6 Nov 2024 23:13:38 -0500 Subject: [PATCH] Bigger solar nerf (#1066) * I'm so tired of hearing about solars. * Adjust SolarFlux<->GT solar conversion recipes to reflect new generation rates * Un-nerf Infinity solars, and partially un-nerf Neutroniums --- config/solarflux/custom_panels.js | 24 ++++---- config/solarflux/panels.cfg | 72 ++++++++++++------------ kubejs/server_scripts/mods/Solar_Flux.js | 17 +++--- 3 files changed, 58 insertions(+), 55 deletions(-) diff --git a/config/solarflux/custom_panels.js b/config/solarflux/custom_panels.js index 3c46e75d4..c1cd2709f 100644 --- a/config/solarflux/custom_panels.js +++ b/config/solarflux/custom_panels.js @@ -42,9 +42,9 @@ function init() panel() .name('bathyal') .height(0.5) - .generation(131072) - .capacity(96000000) - .transfer(1048576) + .generation(32768) + .capacity(1200000) + .transfer(65536) .build() .langBuilder() .put("en_us", "Bathyal Solar Panel") @@ -55,9 +55,9 @@ function init() panel() .name('abyssal') .height(0.5) - .generation(524288) - .capacity(48000000) - .transfer(4194304) + .generation(131072) + .capacity(4000000) + .transfer(262144) .build() .langBuilder() .put("en_us", "Abyssal Solar Panel") @@ -68,9 +68,9 @@ function init() panel() .name('hadal') .height(0.5) - .generation(2097152) - .capacity(192000000) - .transfer(16777216) + .generation(524288) + .capacity(12000000) + .transfer(1048576) .build() .langBuilder() .put("en_us", "Hadal Solar Panel") @@ -80,9 +80,9 @@ function init() // Neutronium panel() .name("neutronium") - .generation(10000000) - .capacity(400000000) - .transfer(64000000) + .generation(2500000) + .capacity(200000000) + .transfer(5000000) .build() .langBuilder() .put("en_us", "Neutronium Solar Panel") diff --git a/config/solarflux/panels.cfg b/config/solarflux/panels.cfg index dd2d02e99..5a311e561 100644 --- a/config/solarflux/panels.cfg +++ b/config/solarflux/panels.cfg @@ -3,158 +3,158 @@ C "Solar Flux"={ C "1"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=25000 + I "Capacity"=200 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=2 + I "Generation Rate"=1 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=6.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=16 + I "Transfer Rate"=2 } C "2"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=125000 + I "Capacity"=400 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=8 + I "Generation Rate"=2 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=6.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=64 + I "Transfer Rate"=4 } C "3"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=425000 + I "Capacity"=1200 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=32 + I "Generation Rate"=8 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=6.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=256 + I "Transfer Rate"=16 } C "4"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=1200000 + I "Capacity"=4000 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=128 + I "Generation Rate"=32 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=6.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=1024 + I "Transfer Rate"=64 } C "5"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=3000000 + I "Capacity"=12000 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=512 + I "Generation Rate"=128 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=6.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=4096 + I "Transfer Rate"=256 } C "6"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=6000000 + I "Capacity"=40000 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=2048 + I "Generation Rate"=512 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=6.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=16348 + I "Transfer Rate"=1024 } C "7"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=12000000 + I "Capacity"=120000 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=8192 + I "Generation Rate"=2048 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=6.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=65536 + I "Transfer Rate"=4096 } C "8"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=24000000 + I "Capacity"=400000 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=32768 + I "Generation Rate"=8192 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=6.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=262144 + I "Transfer Rate"=16384 } } C "Solar Flux: Custom"={ C "custom_abyssal"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=48000000 + I "Capacity"=4000000 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=524288 + I "Generation Rate"=131072 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=8.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=4194304 + I "Transfer Rate"=262144 } C "custom_bathyal"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=96000000 + I "Capacity"=1200000 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=131072 + I "Generation Rate"=32768 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=8.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=1048576 + I "Transfer Rate"=65536 } C "custom_hadal"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=192000000 + I "Capacity"=12000000 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=2097152 + I "Generation Rate"=524288 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=8.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=16777216 + I "Transfer Rate"=1048576 } C "custom_infinity"={ @@ -173,15 +173,15 @@ C "Solar Flux: Custom"={ C "custom_neutronium"={ /* How much FE does this solar panel store? (Range: [1; 9223372036854775807]) */ - I "Capacity"=400000000 + I "Capacity"=200000000 /* How much FE does this solar panel produce per tick? (Range: [1; 9223372036854775807]) */ - I "Generation Rate"=10000000 + I "Generation Rate"=2500000 /* How high is this solar panel? (Range: [0.0; 16.0)) */ D "Height"=6.0 /* How much FE does this solar panel emit to other block, per tick? (Range: [1; 9223372036854775807]) */ - I "Transfer Rate"=64000000 + I "Transfer Rate"=5000000 } } \ No newline at end of file diff --git a/kubejs/server_scripts/mods/Solar_Flux.js b/kubejs/server_scripts/mods/Solar_Flux.js index f4dc33fa3..5e62c78ef 100644 --- a/kubejs/server_scripts/mods/Solar_Flux.js +++ b/kubejs/server_scripts/mods/Solar_Flux.js @@ -225,26 +225,29 @@ ServerEvents.recipes(event => { event.remove({ id: /gtceu:shaped\/solar_panel_/ }) // Basic conversion & reversion - event.shapeless('2x gtceu:solar_panel', 'solarflux:sp_2').id('gtceu:solar_panel_basic_conversion') - event.shapeless('solarflux:sp_2', '2x gtceu:solar_panel').id('gtceu:solar_panel_basic_reversion') + event.shapeless('2x gtceu:solar_panel', 'solarflux:sp_3').id('gtceu:solar_panel_basic_conversion') + event.shapeless('solarflux:sp_3', '2x gtceu:solar_panel').id('gtceu:solar_panel_basic_reversion') // Generic conversion & reversion (Note the switch for Sculk solars) for (let index = 0; index <= 8; index++) { let tiername = TIER_ID_MAPPING[index].toLowerCase(); let solarFluxPanel; - if(index <= 5) { - solarFluxPanel = `solarflux:sp_${index+3}`; + if(index <= 4) { + solarFluxPanel = `solarflux:sp_${index+4}`; } else { switch (index) { - case 6: + case 5: solarFluxPanel = 'solarflux:sp_custom_bathyal' break; - case 7: + case 6: solarFluxPanel = 'solarflux:sp_custom_abyssal' break; - case 8: + case 7: solarFluxPanel = 'solarflux:sp_custom_hadal' break; + case 8: + solarFluxPanel = 'solarflux:sp_custom_neutronium' + break; default: break; }