Skip to content

Commit

Permalink
Revert "Slower plasma fire and temperature decay (#28171)"
Browse files Browse the repository at this point in the history
This reverts commit 9be5e7d.
  • Loading branch information
Burzah authored Feb 7, 2025
1 parent 9be5e7d commit e0b77ba
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions rust/src/milla/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ pub(crate) const PLASMA_BURN_MIN_TEMP: f32 = 100.0 + T0C;
pub(crate) const PLASMA_BURN_OPTIMAL_TEMP: f32 = 1370.0 + T0C;

/// How much of the plasma are we willing to burn each tick?
pub(crate) const PLASMA_BURN_MAX_RATIO: f32 = 0.01;
pub(crate) const PLASMA_BURN_MAX_RATIO: f32 = 0.05;

/// How much of the plasma do we burn anyway if the ratio would make it really small?
pub(crate) const PLASMA_BURN_MIN_MOLES: f32 = 0.001;
Expand Down Expand Up @@ -148,10 +148,10 @@ pub(crate) const TEST_TOLERANCE: f32 = 0.1;
pub(crate) const SPACE_COOLING_THRESHOLD: f32 = T20C;

/// Lose this amount of heat energy per tick if above SPACE_COOLING_THRESHOLD.
pub(crate) const SPACE_COOLING_FLAT: f32 = 200.0;
pub(crate) const SPACE_COOLING_FLAT: f32 = 2000.0;

/// Lose this ratio of heat energy per Kelvin per tick if above SPACE_COOLING_THRESHOLD.
pub(crate) const SPACE_COOLING_TEMPERATURE_RATIO: f32 = 0.4;
/// Lose this ratio of heat energy per tick if above SPACE_COOLING_THRESHOLD.
pub(crate) const SPACE_COOLING_RATIO: f32 = 0.002;

/// Tiles with less than this much gas will become empty.
pub(crate) const MINIMUM_NONZERO_MOLES: f32 = 0.1;
Expand Down
2 changes: 1 addition & 1 deletion rust/src/milla/simulate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ pub(crate) fn apply_tile_mode(
if my_next_tile.temperature() > SPACE_COOLING_THRESHOLD {
let excess_thermal_energy = my_next_tile.thermal_energy
- SPACE_COOLING_THRESHOLD * my_next_tile.heat_capacity();
let cooling = (SPACE_COOLING_FLAT + SPACE_COOLING_TEMPERATURE_RATIO * my_next_tile.temperature())
let cooling = (SPACE_COOLING_FLAT + SPACE_COOLING_RATIO * excess_thermal_energy)
.min(excess_thermal_energy);
my_next_tile.thermal_energy -= cooling;
}
Expand Down
Binary file modified rustlibs.dll
Binary file not shown.
Binary file modified rustlibs_prod.dll
Binary file not shown.
Binary file modified tools/ci/librustlibs_ci.so
Binary file not shown.

0 comments on commit e0b77ba

Please sign in to comment.