cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-04 14:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup, adds setup parameters for atmos machinery

Browse Source 
Allows atmos machinery efficiency to be adjusted in setup.dm
Limits flow rates when moving gas from a turf to avoid very high pressures being created when they shouldn't be.
Attempts to limit processing when there isn't much gas to be moved, for performance.
Reverts all changes to _gas_mixture.dm
This commit is contained in:
mwerezak
2014-07-26 13:08:02 -04:00
parent 11c9f3bb9b
commit 3f6c1ff622
5 changed files with 184 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
code/ATMOSPHERICS/components/unary/vent_pump.dm
View File

@@ -144,16 +144,14 @@
last_power_draw = 0
last_flow_rate = 0
return 0
var/datum/gas_mixture/environment = loc.return_air()
var/environment_pressure = environment.return_pressure()
if(air_contents.temperature == 0 && environment.temperature == 0)
return 0
var/pressure_delta = DEFAULT_PRESSURE_DELTA
if(pressure_delta > 0.5)
var/power_draw = -1
if((air_contents.temperature > 0 || environment.temperature > 0) && pressure_delta > 0.5)
if(pump_direction) //internal -> external
if(pressure_checks & PRESSURE_CHECK_EXTERNAL)
pressure_delta = min(pressure_delta, external_pressure_bound - environment_pressure) //increasing the pressure here
@@ -166,7 +164,7 @@
var/air_temperature = environment.temperature? environment.volume : air_contents.temperature
var/transfer_moles = pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION)
transfer_gas(air_contents, environment, transfer_moles)
power_draw = transfer_gas(air_contents, environment, transfer_moles)
else //external -> internal
if(pressure_checks & PRESSURE_CHECK_EXTERNAL)
pressure_delta = min(pressure_delta, environment_pressure - external_pressure_bound) //decreasing the pressure here
@@ -178,46 +176,57 @@
var/air_temperature = air_contents.temperature? air_contents.temperature : environment.temperature
var/transfer_moles = pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION)
transfer_gas(environment, air_contents, transfer_moles)
//limit flow rate from turfs
transfer_moles = min(transfer_moles, environment.total_moles*MAX_SIPHON_FLOWRATE/environment.volume) //group_multiplier gets divided out here
power_draw = transfer_gas(environment, air_contents, transfer_moles)
if(network)
network.update = 1
else
if (power_draw < 0)
last_power_draw = 0
last_flow_rate = 0
update_use_power(0)
if (power_draw > 0)
handle_pump_power_draw(power_draw)
last_power_draw = power_draw
else
handle_pump_power_draw(idle_power_usage)
last_power_draw = idle_power_usage
return 1
//pumps gas from source to sink and returns the power used, or -1 if no pumping was done.
/obj/machinery/atmospherics/unary/vent_pump/proc/transfer_gas(datum/gas_mixture/source, datum/gas_mixture/sink, var/transfer_moles)
if(source.total_moles == 0)
update_use_power(0)
return
if(source.total_moles < MINUMUM_MOLES_TO_PUMP)
return -1
//limit transfer_moles by available power
var/specific_power = calculate_specific_power(source, sink) //this has to be calculated before we modify any gas mixtures
var/specific_power = calculate_specific_power(source, sink)/ATMOS_PUMP_EFFICIENCY //this has to be calculated before we modify any gas mixtures
if (specific_power > 0)
transfer_moles = min(transfer_moles, active_power_usage / specific_power)
//Get the gas to be transferred
if (transfer_moles < MINUMUM_MOLES_TO_PUMP)
return -1 //don't bother
var/datum/gas_mixture/removed = source.remove(transfer_moles)
if (isnull(removed)) //not sure why this would happen, but it does at the very beginning of the game
return
return -1
last_flow_rate = (removed.total_moles/(removed.total_moles + source.total_moles))*source.volume
var/power_draw = specific_power*transfer_moles
if (power_draw > 0)
removed.add_thermal_energy(power_draw)
handle_pump_power_draw(power_draw)
last_power_draw = power_draw
else
handle_pump_power_draw(idle_power_usage)
last_power_draw = idle_power_usage
//merge the removed gas into the sink
sink.merge(removed)
return power_draw
//Radio remote control

143
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
View File

@@ -122,66 +122,17 @@
return 0
var/datum/gas_mixture/environment = loc.return_air()
if ((environment.total_moles == 0) || (environment.temperature == 0 && air_contents.temperature == 0))
var/power_draw = -1
if (environment.temperature > 0 || air_contents.temperature > 0)
if(scrubbing)
power_draw = filter_gas(environment)
else //Just siphon all air
power_draw = siphon_gas(environment)
if (power_draw < 0)
update_use_power(0)
return
var/power_draw
if(scrubbing)
//Filter it
var/total_specific_power = 0 //the power required to remove one mole of filterable gas
var/total_filterable_moles = 0
var/list/specific_power_gas = list()
for (var/g in scrubbing_gas)
if (environment.gas[g] < 0.1)
continue //don't bother
var/specific_power = calculate_specific_power_gas(g, environment, air_contents)
specific_power_gas[g] = specific_power
total_specific_power += specific_power
total_filterable_moles += environment.gas[g]
if (total_filterable_moles == 0)
update_use_power(0)
return
//Calculate the amount of energy required and limit transfer_moles based on available power
power_draw = 0
var/total_transfer_moles = total_filterable_moles
if (total_specific_power > 0)
total_transfer_moles = min(total_transfer_moles, active_power_usage/total_specific_power)
for (var/g in scrubbing_gas)
var/transfer_moles = environment.gas[g]
if (specific_power_gas[g] > 0)
//if our flow rate is limited by available power, the proportion of the filtered gas is based on mole ratio
transfer_moles = min(transfer_moles, total_transfer_moles*(environment.gas[g]/total_filterable_moles))
environment.gas[g] -= transfer_moles
air_contents.gas[g] += transfer_moles
power_draw += specific_power_gas[g]*transfer_moles
//Remix the resulting gases
air_contents.update_values()
environment.update_values()
else //Just siphon all air
var/transfer_moles = environment.total_moles
//Calculate the amount of energy required
var/specific_power = calculate_specific_power(environment, air_contents) //this has to be calculated before we modify any gas mixtures
if (specific_power > 0)
transfer_moles = min(transfer_moles, active_power_usage / specific_power)
if (transfer_moles < 0.01)
update_use_power(0)
return //don't bother
power_draw = specific_power*transfer_moles
air_contents.merge(environment.remove(transfer_moles))
if (power_draw > 0)
air_contents.add_thermal_energy(power_draw)
else if (power_draw > 0)
//last_power_draw = power_draw
handle_pump_power_draw(power_draw)
else
@@ -193,6 +144,80 @@
return 1
//filters gas from environment and returns the amount of power used, or -1 if no filtering was done
/obj/machinery/atmospherics/unary/vent_scrubber/proc/filter_gas(datum/gas_mixture/environment)
//Filter it
var/total_specific_power = 0 //the power required to remove one mole of filterable gas
var/total_filterable_moles = 0
var/list/specific_power_gas = list()
for (var/g in scrubbing_gas)
if (environment.gas[g] < MINUMUM_MOLES_TO_PUMP)
continue //don't bother
var/specific_power = calculate_specific_power_gas(g, environment, air_contents)/ATMOS_FILTER_EFFICIENCY
specific_power_gas[g] = specific_power
total_specific_power += specific_power
total_filterable_moles += environment.gas[g]
if (total_filterable_moles < MINUMUM_MOLES_TO_PUMP)
return -1
//Figure out how much of each gas to filter
var/total_transfer_moles = total_filterable_moles
//limit flow rate from turfs
total_transfer_moles = min(total_transfer_moles, environment.total_moles*MAX_FILTER_FLOWRATE/environment.volume) //group_multiplier gets divided out here
//limit transfer_moles based on available power
var/power_draw = 0
if (total_specific_power > 0)
total_transfer_moles = min(total_transfer_moles, active_power_usage/total_specific_power)
for (var/g in scrubbing_gas)
var/transfer_moles = environment.gas[g]
if (specific_power_gas[g] > 0)
//if our flow rate is being limited by available power, the proportion of the filtered gas is based on mole ratio
transfer_moles = min(transfer_moles, total_transfer_moles*(environment.gas[g]/total_filterable_moles))
environment.gas[g] -= transfer_moles
air_contents.gas[g] += transfer_moles
power_draw += specific_power_gas[g]*transfer_moles
if (power_draw > 0)
air_contents.add_thermal_energy(power_draw)
//Remix the resulting gases
air_contents.update_values()
environment.update_values()
return power_draw
//siphons gas from environment and returns the power used, or -1 if no siphoning was done
/obj/machinery/atmospherics/unary/vent_scrubber/proc/siphon_gas(datum/gas_mixture/environment)
if (environment.total_moles < MINUMUM_MOLES_TO_PUMP)
return -1 //no point doing all this processing when source is a vacuum
var/transfer_moles = environment.total_moles
//limit flow rate from turfs
transfer_moles = min(transfer_moles, environment.total_moles*MAX_SIPHON_FLOWRATE/environment.volume) //group_multiplier gets divided out here
//Calculate the amount of energy required and limit transfer_moles based on available power
var/specific_power = calculate_specific_power(environment, air_contents)/ATMOS_PUMP_EFFICIENCY //this has to be calculated before we modify any gas mixtures
if (specific_power > 0)
transfer_moles = min(transfer_moles, active_power_usage / specific_power)
if (transfer_moles < MINUMUM_MOLES_TO_PUMP)
return -1 //don't bother
var/power_draw = specific_power*transfer_moles
var/datum/gas_mixture/removed = environment.remove(transfer_moles)
if (power_draw > 0)
removed.add_thermal_energy(power_draw)
air_contents.merge(removed)
return power_draw
/obj/machinery/atmospherics/unary/vent_scrubber/hide(var/i) //to make the little pipe section invisible, the icon changes.
update_icon()