Module:Combustion - Revision history

RA2lover: fix gas hypergolics having the enthalpy of liquid hypergolics

2026-03-19T05:26:37Z

fix gas hypergolics having the enthalpy of liquid hypergolics

← Older revision		Revision as of 05:26, 19 March 2026
Line 60:		Line 60:
	local LatentHeat		local LatentHeat
	if Fuel.Gas.State=="Liquid" then LatentHeat = Fuel.Gas.LatentHeat else LatentHeat = 0 end		if Fuel.Gas.State=="Liquid" then LatentHeat = Fuel.Gas.LatentHeat else LatentHeat = 0 end
	return (Fuel.Gas.Enthalpy-~~Fuel.Gas.~~LatentHeat)*Fuel.Amount		return (Fuel.Gas.Enthalpy-LatentHeat)*Fuel.Amount
	end		end

RA2lover: Evaporate liquid hypergols on combustion enthalpy calculation

2026-03-18T23:57:38Z

Evaporate liquid hypergols on combustion enthalpy calculation

← Older revision		Revision as of 23:57, 18 March 2026
Line 57:		Line 57:

	function p.GetCombustionEnergy(Fuel, Oxidizer)		function p.GetCombustionEnergy(Fuel, Oxidizer)
	if Fuel.Gas.IsHypergol then return Fuel.Gas.Enthalpy*Fuel.Amount end		if Fuel.Gas.IsHypergol then
			local LatentHeat
			if Fuel.Gas.State=="Liquid" then LatentHeat = Fuel.Gas.LatentHeat else LatentHeat = 0 end
			return (Fuel.Gas.Enthalpy-Fuel.Gas.LatentHeat)*Fuel.Amount
			end

	if not Oxidizer or not Oxidizer.Gas then Oxidizer = {Gas = Gas.GetGas("Oxygen"), Amount = 1} end		if not Oxidizer or not Oxidizer.Gas then Oxidizer = {Gas = Gas.GetGas("Oxygen"), Amount = 1} end

RA2lover at 23:49, 18 March 2026

2026-03-18T23:49:07Z

← Older revision		Revision as of 23:49, 18 March 2026
Line 117:		Line 117:

	-- Attempt to autofill inputs from combustion data table if they're absent		-- Attempt to autofill inputs from combustion data table if they're absent
	mw.log ("FuelName: "..fuel~~.Name..", OxidizerName: "..oxidizer~~.Name)		mw.log ("FuelName: "..fuel.Name)

	if not oxidizer and not fuelAmount then fuelAmount = CombustionData[fuel.Name].FuelAmount end		if not oxidizer and not fuelAmount then fuelAmount = CombustionData[fuel.Name].FuelAmount end

RA2lover at 23:48, 18 March 2026

2026-03-18T23:48:23Z

← Older revision		Revision as of 23:48, 18 March 2026
Line 117:		Line 117:

	-- Attempt to autofill inputs from combustion data table if they're absent		-- Attempt to autofill inputs from combustion data table if they're absent
			mw.log ("FuelName: "..fuel.Name..", OxidizerName: "..oxidizer.Name)

	if not oxidizer and not fuelAmount then fuelAmount = CombustionData[fuel.Name].FuelAmount end		if not oxidizer and not fuelAmount then fuelAmount = CombustionData[fuel.Name].FuelAmount end

RA2lover: Attempt parsing matches without an amount provided

2026-03-18T23:43:24Z

Attempt parsing matches without an amount provided

← Older revision		Revision as of 23:43, 18 March 2026
Line 78:		Line 78:
	local gas, amount, remainder = string.match(str, "^[,;:-]?%s([%a%s]+)%s[,;:-]?%s(%d+)(.)$")		local gas, amount, remainder = string.match(str, "^[,;:-]?%s([%a%s]+)%s[,;:-]?%s(%d+)(.)$")
	--"-Liquid Sodium Chloride , 2; Hydrochloric Acid = 1" should result in "Liquid Sodium Chloride", 2, "; Hydrochloric Acid = 1"		--"-Liquid Sodium Chloride , 2; Hydrochloric Acid = 1" should result in "Liquid Sodium Chloride", 2, "; Hydrochloric Acid = 1"
	if not gas then return nil end		if not gas then
			local match = string.match(str,"^[,;:-]?%s([%a%s]+)%s[,;:-]?.*")
			if match then return Gas.GetGas(match) else return nil end
			end
	--mw.log("Gas parsed:")		--mw.log("Gas parsed:")
	--mw.logObject(gas)		--mw.logObject(gas)

RA2lover: Add DontAutofillOutputs optional parameter

2026-03-18T23:08:35Z

Add DontAutofillOutputs optional parameter

← Older revision		Revision as of 23:08, 18 March 2026
Line 119:		Line 119:
	if oxidizer and not oxidizerAmount then oxidizerAmount = CombustionData[fuel.Name][oxidizer.Name].OxidizerAmount end		if oxidizer and not oxidizerAmount then oxidizerAmount = CombustionData[fuel.Name][oxidizer.Name].OxidizerAmount end

	if outputsCount == 0 then		if outputsCount == 0 and not frame.args.DontAutofillOutputs then
	if not oxidizer then outputs = CombustionData[fuel.Name].Outputs end		if not oxidizer then outputs = CombustionData[fuel.Name].Outputs end
	if oxidizer then outputs = CombustionData[fuel.Name][oxidizer.Name].Outputs end		if oxidizer then outputs = CombustionData[fuel.Name][oxidizer.Name].Outputs end

RA2lover: Add input autofill from Module:Combustion/data if quantities are not provided

2026-03-18T22:44:28Z

Add input autofill from Module:Combustion/data if quantities are not provided

← Older revision		Revision as of 22:44, 18 March 2026
Line 1:		Line 1:
	local GasData = mw.loadData("Module:Gas/data")		local GasData = mw.loadData("Module:Gas/data")
			local CombustionData = mw.loadData("Module:Combustion/data")
	local Gas = require("Module:Gas")		local Gas = require("Module:Gas")

Line 92:		Line 93:
	if not frame.args.Fuel then error("Missing 'Fuel' parameter") end		if not frame.args.Fuel then error("Missing 'Fuel' parameter") end
	local fuel, fuelAmount = ParseInput(frame.args.Fuel)		local fuel, fuelAmount = ParseInput(frame.args.Fuel)
	if not fuelAmount then error("Missing quantity for 'Fuel' parameter") end		--if not fuelAmount then error("Missing quantity for 'Fuel' parameter") end

	local oxidizer, oxidizerAmount		local oxidizer, oxidizerAmount
Line 107:		Line 108:
	outputsCount = outputsCount + 1		outputsCount = outputsCount + 1
	local output, outputAmount = ParseInput(v)		local output, outputAmount = ParseInput(v)
	if not outputAmount then error ("Missing quantity for '"..k.."' parameter") end		--if not outputAmount then error ("Missing quantity for '"..k.."' parameter") end
	outputs[outputsCount] = {Gas = output, Amount = outputAmount}		outputs[outputsCount] = {Gas = output, Amount = outputAmount}
	end		end
	end		end

			-- Attempt to autofill inputs from combustion data table if they're absent

			if not oxidizer and not fuelAmount then fuelAmount = CombustionData[fuel.Name].FuelAmount end
			if oxidizer and not fuelAmount then fuelAmount = CombustionData[fuel.Name][oxidizer.Name].FuelAmount end
			if oxidizer and not oxidizerAmount then oxidizerAmount = CombustionData[fuel.Name][oxidizer.Name].OxidizerAmount end

			if outputsCount == 0 then
			if not oxidizer then outputs = CombustionData[fuel.Name].Outputs end
			if oxidizer then outputs = CombustionData[fuel.Name][oxidizer.Name].Outputs end
			end

	return RenderCombustionTemplate(frame, {Gas = fuel, Amount = fuelAmount}, {Gas = oxidizer, Amount = oxidizerAmount}, outputs)		return RenderCombustionTemplate(frame, {Gas = fuel, Amount = fuelAmount}, {Gas = oxidizer, Amount = oxidizerAmount}, outputs)
	end		end

	return p		return p

RA2lover at 21:57, 18 March 2026

2026-03-18T21:57:03Z

← Older revision		Revision as of 21:57, 18 March 2026
Line 97:		Line 97:
	if not fuel.IsHypergol then		if not fuel.IsHypergol then
	if not frame.args.Oxidizer then error("Missing 'Oxidizer' parameter") end		if not frame.args.Oxidizer then error("Missing 'Oxidizer' parameter") end
	~~local~~ oxidizer, oxidizerAmount = ParseInput(frame.args.Oxidizer)		oxidizer, oxidizerAmount = ParseInput(frame.args.Oxidizer)
	end		end

RA2lover at 21:53, 18 March 2026

2026-03-18T21:53:37Z

← Older revision		Revision as of 21:53, 18 March 2026
Line 3:		Line 3:

	local function GetRepresentation(gas, frame)		local function GetRepresentation(gas, frame)
	mw.log("GetRepresentation called. gas:")		--mw.log("GetRepresentation called. gas:")
	mw.logObject(gas)		--mw.logObject(gas)
	mw.log("Frame: ")		--mw.log("Frame: ")
	mw.logObject(frame)		--mw.logObject(frame)
	return frame:expandTemplate({title = "GasIcon", args = {gas.Name} }) -- Embeds a Not-yet-implemented template.		return frame:expandTemplate({title = "GasIcon", args = {gas.Name} }) -- Embeds a Not-yet-implemented template.
	end		end
Line 12:		Line 12:
	local p={}		local p={}
	local function RenderCombustionTemplate(frame, Fuel, Oxidizer, Reagents)		local function RenderCombustionTemplate(frame, Fuel, Oxidizer, Reagents)
			mw.log("RenderCombustionTemplate called. Fuel:")
			mw.logObject(Fuel)
			mw.log("Oxidizer:")
			mw.logObject(Oxidizer)
			mw.log("Reagents:")
			mw.logObject(Reagents)

	--TODO: Add actual formatting into a box or something.		--TODO: Add actual formatting into a box or something.
	local InputReagents = {}		local InputReagents = {}
Line 71:		Line 78:
	--"-Liquid Sodium Chloride , 2; Hydrochloric Acid = 1" should result in "Liquid Sodium Chloride", 2, "; Hydrochloric Acid = 1"		--"-Liquid Sodium Chloride , 2; Hydrochloric Acid = 1" should result in "Liquid Sodium Chloride", 2, "; Hydrochloric Acid = 1"
	if not gas then return nil end		if not gas then return nil end
	mw.log("Gas parsed:")		--mw.log("Gas parsed:")
	mw.logObject(gas)		--mw.logObject(gas)
	mw.log("Amount parsed:")		--mw.log("Amount parsed:")
	mw.logObject(amount)		--mw.logObject(amount)
	mw.log("Remainder:")		--mw.log("Remainder:")
	mw.logObject(remainder)		--mw.logObject(remainder)
	return Gas.GetGas(gas), amount, remainder		return Gas.GetGas(gas), amount, remainder
	end		end

RA2lover at 22:52, 16 March 2026

2026-03-16T22:52:40Z

← Older revision		Revision as of 22:52, 16 March 2026
Line 17:		Line 17:
	local FuelRepresentation = GetRepresentation(Fuel.Gas, frame)		local FuelRepresentation = GetRepresentation(Fuel.Gas, frame)
	table.insert (InputReagents, Fuel.Amount.."x "..FuelRepresentation)		table.insert (InputReagents, Fuel.Amount.."x "..FuelRepresentation)
	if Oxidizer then		if Oxidizer and Oxidizer.Gas then
	local OxidizerRepresentation = GetRepresentation(Oxidizer.Gas, frame)		local OxidizerRepresentation = GetRepresentation(Oxidizer.Gas, frame)
	table.insert (InputReagents, Oxidizer.Amount.."x "..OxidizerRepresentation)		table.insert (InputReagents, Oxidizer.Amount.."x "..OxidizerRepresentation)