Skip to content

Commit

Permalink
Bigger solar nerf (#1066)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@Xefyr0
Xefyr0 authored Nov 7, 2024
1 parent 3601d1c commit 62ba5db
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 55 deletions.
24 changes: 12 additions & 12 deletions config/solarflux/custom_panels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand Down
72 changes: 36 additions & 36 deletions config/solarflux/panels.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"={
Expand All @@ -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
}
}
17 changes: 10 additions & 7 deletions kubejs/server_scripts/mods/Solar_Flux.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 62ba5db

Please sign in to comment.