From b865da6cdd0eac3e02bffd829ad765af72db21c2 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 14 Sep 2014 18:52:05 -0400 Subject: [PATCH] Increases pump and filter performance --- code/ATMOSPHERICS/_atmospherics_helpers.dm | 11 ----------- code/setup.dm | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/code/ATMOSPHERICS/_atmospherics_helpers.dm b/code/ATMOSPHERICS/_atmospherics_helpers.dm index 07ce3121f6..1c2b101f12 100644 --- a/code/ATMOSPHERICS/_atmospherics_helpers.dm +++ b/code/ATMOSPHERICS/_atmospherics_helpers.dm @@ -29,8 +29,6 @@ if (source.total_moles < MINUMUM_MOLES_TO_PUMP) //if we cant transfer enough gas just stop to avoid further processing return -1 - var/source_moles_initial = source.total_moles - if (!transfer_moles) transfer_moles = source.total_moles else @@ -78,7 +76,6 @@ if (source.total_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing return -1 - var/source_moles_initial = source.total_moles filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &= //Determine the specific power of each filterable gas type, and the total amount of filterable gas (gasses selected to be scrubbed) @@ -150,7 +147,6 @@ if (source.total_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing return -1 - var/source_moles_initial = source.total_moles filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &= var/total_specific_power = 0 //the power required to remove one mole of input gas @@ -198,8 +194,6 @@ var/filtered_power_used = 0 //power used to move filterable gas to sink_filtered var/unfiltered_power_used = 0 //power used to move unfilterable gas to sink_clean - var/filtered_heat = 0 - //var/a = 0 for (var/g in removed.gas) var/power_used = specific_power_gas[g]*removed.gas[g] @@ -208,8 +202,6 @@ removed.adjust_gas(g, -removed.gas[g], update=0) sink_filtered.adjust_gas_temp(g, removed.gas[g], removed.temperature, update=0) filtered_power_used += power_used - filtered_heat += power_used * (removed.gas[g] / source_moles_initial) - //a += (removed.gas[g] / source.total_moles) else unfiltered_power_used += power_used @@ -227,7 +219,6 @@ if (source.total_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing return -1 - var/source_moles_initial = source.total_moles filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &= var/total_specific_power = 0 //the power required to remove one mole of input gas @@ -276,7 +267,6 @@ var/list/filtered_power_used = list() //power used to move filterable gas to the filtered gas mixes var/unfiltered_power_used = 0 //power used to move unfilterable gas to sink_clean - var/list/filtered_heat = list() for (var/g in removed.gas) var/power_used = specific_power_gas[g]*removed.gas[g] @@ -287,7 +277,6 @@ removed.adjust_gas(g, -removed.gas[g], update=0) if (power_used) filtered_power_used[sink_filtered] = power_used - filtered_heat[sink_filtered] = power_used * (removed.gas[g] / source_moles_initial) else unfiltered_power_used += power_used diff --git a/code/setup.dm b/code/setup.dm index e79a2cffcf..d4c5640166 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -837,8 +837,8 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse //These balance how easy or hard it is to create huge pressure gradients with pumps and filters. Lower values means it takes longer to create large pressures differences. //Has no effect on pumping gasses from high pressure to low, only from low to high. Must be between 0 and 1. -#define ATMOS_PUMP_EFFICIENCY 1.0 -#define ATMOS_FILTER_EFFICIENCY 1.0 +#define ATMOS_PUMP_EFFICIENCY 2.5 +#define ATMOS_FILTER_EFFICIENCY 2.5 //will not bother pumping or filtering if the gas source as fewer than this amount of moles, to help with performance. #define MINUMUM_MOLES_TO_PUMP 0.01