From 1cf6ace74e55e3b05bf9893cc3d2e057cf2aec1f Mon Sep 17 00:00:00 2001 From: HarpyEagle Date: Fri, 9 Oct 2015 01:04:57 -0400 Subject: [PATCH] Fixes #11071, #10936 Adjusts fire_fuel_energy_release to compensate for fixed fire heat release. Adjusts liquid fire burn parameters so that liquid fuel fire heat release and burn duration is unaffected. --- code/ZAS/Gas.dm | 3 +++ code/ZAS/Variable Settings.dm | 3 ++- code/setup.dm | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/ZAS/Gas.dm b/code/ZAS/Gas.dm index 0f3faa09b4..20dd67bf34 100644 --- a/code/ZAS/Gas.dm +++ b/code/ZAS/Gas.dm @@ -21,6 +21,9 @@ /xgm_gas/phoron id = "phoron" name = "Phoron" + + //Note that this has a significant impact on TTV yield. + //Because it is so high, any leftover phoron soaks up a lot of heat and drops the yield pressure. specific_heat = 200 // J/(mol*K) //Hypothetical group 14 (same as carbon), period 8 element. diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index c152159b7a..7700fee2bb 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -9,7 +9,8 @@ var/global/vs_control/vsc = new var/fire_firelevel_multiplier_NAME = "Fire - Firelevel Constant" var/fire_firelevel_multiplier_DESC = "Multiplied by the equation for firelevel, affects mainly the extingiushing of fires." - var/fire_fuel_energy_release = 397000 + //Note that this parameter and the phoron heat capacity have a significant impact on TTV yield. + var/fire_fuel_energy_release = 866000 //J/mol. Adjusted to compensate for fire energy release being fixed, was 397000 var/fire_fuel_energy_release_NAME = "Fire - Fuel energy release" var/fire_fuel_energy_release_DESC = "The energy in joule released when burning one mol of a burnable substance" diff --git a/code/setup.dm b/code/setup.dm index 7473822cc6..8371ca3cdd 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -142,15 +142,15 @@ //These control the speed at which fire burns #define FIRE_GAS_BURNRATE_MULT 1 -#define FIRE_LIQUID_BURNRATE_MULT 0.4 +#define FIRE_LIQUID_BURNRATE_MULT 0.225 //If the fire is burning slower than this rate then the reaction is going too slow to be self sustaining and the fire burns itself out. //This ensures that fires don't grind to a near-halt while still remaining active forever. #define FIRE_GAS_MIN_BURNRATE 0.01 -#define FIRE_LIQUD_MIN_BURNRATE 0.01 +#define FIRE_LIQUD_MIN_BURNRATE 0.0025 //How many moles of fuel are contained within one solid/liquid fuel volume unit -#define LIQUIDFUEL_AMOUNT_TO_MOL 1 //mol/volume unit +#define LIQUIDFUEL_AMOUNT_TO_MOL 0.45 //mol/volume unit #define T0C 273.15 // 0.0 degrees celcius #define T20C 293.15 // 20.0 degrees celcius