From 7159695010b9f3827b7f8858a3fabd517519d72c Mon Sep 17 00:00:00 2001
From: Adamo <adamo@adamonet>
Date: Sun, 28 Jun 2020 04:09:16 -0400
Subject: [PATCH] Added integration for Angel's.

---
 changelog.txt    |   7 +++
 data-updates.lua | 131 ++++++++++++++++++++++++++---------------------
 2 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 14d0dfc..ac61440 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+---------------------------------------------------------------------------------------------------
+Version: 0.2.2
+Date: 2020-06-26
+
+  Changes:
+    - Added integration for Angel's Petrochem Hydrofluoric Acid.
+
 ---------------------------------------------------------------------------------------------------
 Version: 0.2.1
 Date: 2020-06-26
diff --git a/data-updates.lua b/data-updates.lua
index 63ea087..16bfc2f 100644
--- a/data-updates.lua
+++ b/data-updates.lua
@@ -281,68 +281,81 @@ reactor.heat_buffer.heat_glow = {
 		}
 	}
 }
-if not data.raw.fluid["adamo-chemical-hydrofluoric-acid"] then
-	local hydrofluoric_acid_fluid = {
-		type = "fluid",
-		name = "adamo-chemical-hydrofluoric-acid",
-		order = "a[fluid]-g[adamo-chemical-hydrofluoric-acid]",
-		icon = "__adamo-nuclear__/graphics/icons/hydrofluoride.png",
-		icon_size = 32,
-		base_color = colors.hf_base,
-		flow_color = colors.hf_flow,
-		default_temperature = 25,
-		max_temperature = 100,
-		heat_capacity = "0.1KJ",
-	}
-	local hydrofluoric_acid_recipe = {
-		type = "recipe",
-		name = "adamo-chemical-hydrofluoric-acid",
-		category = "chemistry",
-		subgroup = "fluid-recipes",
-		enabled = false,
-		energy_required = 1, -- same as sulfuric-acid
-		ingredients = {{
-				type = "item",
-				name = "stone",
-				amount = 50
-			},{
-				type = "fluid",
-				name = "sulfuric-acid",
-				amount = 50
-			},{
-				type = "fluid",
-				name = "water",
-				amount = 50
-		}},
-		results = {{
-				type='fluid',
-				name = "adamo-chemical-hydrofluoric-acid",
-				amount = 50
-		}},
-		main_product = "adamo-chemical-hydrofluoric-acid",
-		requester_paste_multiplier = 4,
-		crafting_machine_tint = {
-			primary = data.raw.fluid["sulfuric-acid"].flow_color,
-			secondary = colors.hf_base,
-			tertiary = data.raw.fluid["sulfuric-acid"].base_color,
-		},
-	}
-	data:extend({
-		hydrofluoric_acid_fluid,
-		hydrofluoric_acid_recipe
-	})
-	table.insert(
-		data.raw.technology["uranium-processing"].effects,
-		{
-			type = "unlock-recipe",
-			recipe = "adamo-chemical-hydrofluoric-acid"
-		}
-	)
-end
-
 
 adamomods.logging=true
 
+if not data.raw.fluid["adamo-chemical-hydrofluoric-acid"] then
+	if data.raw.fluid["liquid-hydrofluoric-acid"] then
+		for _,recipe in pairs(data.raw.recipe) do
+			if recipe_uses(recipe,"adamo-chemical-hydrofluoric-acid")
+			then
+				replace_recipe_io(
+					recipe,
+					"adamo-chemical-hydrofluoric-acid",
+					"liquid-hydrofluoric-acid"
+				)
+			end
+		end
+	else
+		local hydrofluoric_acid_fluid = {
+			type = "fluid",
+			name = "adamo-chemical-hydrofluoric-acid",
+			order = "a[fluid]-g[adamo-chemical-hydrofluoric-acid]",
+			icon = "__adamo-nuclear__/graphics/icons/hydrofluoride.png",
+			icon_size = 32,
+			base_color = colors.hf_base,
+			flow_color = colors.hf_flow,
+			default_temperature = 25,
+			max_temperature = 100,
+			heat_capacity = "0.1KJ",
+		}
+		local hydrofluoric_acid_recipe = {
+			type = "recipe",
+			name = "adamo-chemical-hydrofluoric-acid",
+			category = "chemistry",
+			subgroup = "fluid-recipes",
+			enabled = false,
+			energy_required = 1, -- same as sulfuric-acid
+			ingredients = {{
+					type = "item",
+					name = "stone",
+					amount = 50
+				},{
+					type = "fluid",
+					name = "sulfuric-acid",
+					amount = 50
+				},{
+					type = "fluid",
+					name = "water",
+					amount = 50
+			}},
+			results = {{
+					type='fluid',
+					name = "adamo-chemical-hydrofluoric-acid",
+					amount = 50
+			}},
+			main_product = "adamo-chemical-hydrofluoric-acid",
+			requester_paste_multiplier = 4,
+			crafting_machine_tint = {
+				primary = data.raw.fluid["sulfuric-acid"].flow_color,
+				secondary = colors.hf_base,
+				tertiary = data.raw.fluid["sulfuric-acid"].base_color,
+			},
+		}
+		data:extend({
+			hydrofluoric_acid_fluid,
+			hydrofluoric_acid_recipe
+		})
+		table.insert(
+			data.raw.technology["uranium-processing"].effects,
+			{
+				type = "unlock-recipe",
+				recipe = "adamo-chemical-hydrofluoric-acid"
+			}
+		)
+	end
+end
+
 if settings.startup["adamo-nuclear-recipe-trolling"].value then
 	for _,recipe in pairs(data.raw.recipe) do
 		if recipe_uses(recipe,"uranium-238") then