Skip to content

Commit 9c0fde9

Browse files
committed
rebalance everything
1 parent 7d84575 commit 9c0fde9

File tree

9 files changed

+21
-23
lines changed

9 files changed

+21
-23
lines changed

common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/exhaust/ExhaustBlockEntity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ import kotlin.math.pow
3030

3131
class ExhaustBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: BlockState) : KNodeBlockEntity(type, pos, state),
3232
IAirCurrentSource, BlockEntityPhysicsListener {
33-
val MASS_PER_EXHAUST = 0.0005
33+
val MASS_PER_EXHAUST = 0.001
3434

3535
val facing: Direction = state.getValue(BlockStateProperties.FACING)
3636

3737
override lateinit var dimension: DimensionId
3838
// Airflow speed parameters cannot be easily made configurable because air current code runs both on server and client
3939
// so values need to somehow be synced.
4040
val MAX_AIRFLOW_SPEED = 256F // like a maxed out encased fan with default max rpm cap
41-
val PRESSURE_TO_SPEED = 256F / 2500F // outflow pressure in exhausts is very low compared to thrusters, may need tweaking later
41+
val PRESSURE_TO_SPEED = 256F / 10000F // outflow pressure in exhausts is very low compared to thrusters, may need tweaking later
4242

4343
@JvmField
4444
var airCurrent: AirCurrent? = null

common/src/main/kotlin/org/valkyrienskies/clockwork/content/logistics/gas/generation/coal_burner/CoalBurnerBlockEntity.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ class CoalBurnerBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: Bloc
6464
val currentInternalTemperature = kelvin.getTemperatureAt(blockPos.toDuctNodePos(level!!.dimension().location()))
6565
if (currentInternalGasses.values.sum() > 1e-5) {
6666
val currentInternalHeatCapacity = mixtureCapacity(currentInternalGasses)
67-
val targetTemperature = 1000.0
68-
val maxEnergyAddedThisTick = (FUEL_ENERGY_DENSITY * (maxBurnTime / LOG_BURN_TIME)) / 20.0
69-
val energyToAdd = min(currentInternalHeatCapacity * (targetTemperature - currentInternalTemperature), maxEnergyAddedThisTick)
67+
val targetTemperature = 850.0
68+
val energyToAdd = min(currentInternalHeatCapacity * (targetTemperature - currentInternalTemperature), MAX_JOULES_PER_TICK)
7069
if (energyToAdd > 0) {
7170
kelvin.modHeatEnergy(blockPos.toDuctNodePos(level!!.dimension().location()), energyToAdd)
7271
}
@@ -265,7 +264,6 @@ class CoalBurnerBlockEntity(type: BlockEntityType<*>, pos: BlockPos, state: Bloc
265264

266265

267266
companion object {
268-
const val FUEL_ENERGY_DENSITY = 17000.0 // J per kg
269-
const val LOG_BURN_TIME = 300.0 // ticks
267+
const val MAX_JOULES_PER_TICK = 10000.0
270268
}
271269
}

common/src/main/resources/data/vs_clockwork/kelvin_reactions/bog_combustion.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"kelvin:min_temperature": 800,
1414
"kelvin:max_temperature": 1200
1515
},
16-
"energy": 30000,
16+
"energy": 3500,
1717
"result_gasses": {
1818
"vs_clockwork:exhaust": {
19-
"amount": 0.003,
19+
"amount": 0.012,
2020
"unit": "kg"
2121
},
2222
"vs_clockwork:steam": {
23-
"amount": 0.003,
23+
"amount": 0.012,
2424
"unit": "kg"
2525
}
2626
}

common/src/main/resources/data/vs_clockwork/kelvin_reactions/bog_combustion_boosted.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"kelvin:min_temperature": 600,
1414
"kelvin:max_temperature": 1300
1515
},
16-
"energy": 70000,
16+
"energy": 7000,
1717
"result_gasses": {
1818
"vs_clockwork:exhaust": {
19-
"amount": 0.004,
19+
"amount": 0.016,
2020
"unit": "kg"
2121
},
2222
"vs_clockwork:steam": {
23-
"amount": 0.004,
23+
"amount": 0.016,
2424
"unit": "kg"
2525
}
2626
}

common/src/main/resources/data/vs_clockwork/kelvin_reactions/phlogiston_air.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"requirements": {
1313
"kelvin:min_temperature": 500
1414
},
15-
"energy": 160000,
15+
"energy": 20000,
1616
"result_gasses": {
1717
"vs_clockwork:exhaust": {
18-
"amount": 0.01,
18+
"amount": 0.04,
1919
"unit": "kg"
2020
}
2121
}

common/src/main/resources/data/vs_clockwork/kelvin_reactions/phlogiston_ozonite.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"requirements": {
1313
"kelvin:min_temperature": 375
1414
},
15-
"energy": 320000,
15+
"energy": 40000,
1616
"result_gasses": {
1717
"vs_clockwork:exhaust": {
18-
"amount": 0.02,
18+
"amount": 0.08,
1919
"unit": "kg"
2020
}
2121
}

common/src/main/resources/data/vs_clockwork/kelvin_reactions/phlogiston_passive.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"requirements": {
99
"kelvin:min_temperature": 700
1010
},
11-
"energy": 80000,
11+
"energy": 10000,
1212
"result_gasses": {
1313
"vs_clockwork:exhaust": {
14-
"amount": 0.002,
14+
"amount": 0.008,
1515
"unit": "kg"
1616
}
1717
}

common/src/main/resources/data/vs_clockwork/kelvin_reactions/stellane_combustion.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"kelvin:min_temperature": 775,
1414
"kelvin:max_temperature": 1500
1515
},
16-
"energy": 60000,
16+
"energy": 7500,
1717
"result_gasses": {
1818
"vs_clockwork:steam": {
19-
"amount": 0.006,
19+
"amount": 0.02,
2020
"unit": "kg"
2121
}
2222
}

common/src/main/resources/data/vs_clockwork/kelvin_reactions/stellane_combustion_boosted.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"kelvin:min_temperature": 500,
1414
"kelvin:max_temperature": 1750
1515
},
16-
"energy": 160000,
16+
"energy": 15000,
1717
"result_gasses": {
1818
"vs_clockwork:steam": {
19-
"amount": 0.01,
19+
"amount": 0.04,
2020
"unit": "kg"
2121
}
2222
}

0 commit comments

Comments
 (0)