Mercurial > bmsapp / file diff

--- a/src/EditProductTab3.cpp	Fri Nov 04 14:17:56 2022 +0100
+++ b/src/EditProductTab3.cpp	Fri Nov 04 15:56:14 2022 +0100
@@ -238,18 +238,28 @@
 	for (i = 0; i < product->hops.size(); i++) {
 	    if (product->hops.at(i).useat == HOP_USEAT_FWH || product->hops.at(i).useat == HOP_USEAT_BOIL ||
 		product->hops.at(i).useat == HOP_USEAT_AROMA || product->hops.at(i).useat == HOP_USEAT_WHIRLPOOL) {
-		if (product->hops.at(i).form == HOP_FORMS_PELLET || product->hops.at(i).form == HOP_FORMS_PLUG ||
-		    product->hops.at(i).form == HOP_FORMS_CRYO) {
-		    product->boil_absorb += 2.67 * product->hops.at(i).amount;
+		if (product->hops.at(i).form == HOP_FORMS_PELLET) {
+		    product->boil_absorb += my_ha_pellet * product->hops.at(i).amount;
+		} else if (product->hops.at(i).form == HOP_FORMS_PLUG) {
+		    product->boil_absorb += my_ha_plug * product->hops.at(i).amount;
 		} else if (product->hops.at(i).form == HOP_FORMS_LEAF) {
-		    product->boil_absorb += 6.01 * product->hops.at(i).amount;
+		    product->boil_absorb += my_ha_leaf * product->hops.at(i).amount;
+		} else if (product->hops.at(i).form == HOP_FORMS_LEAF_WET) {
+		    product->boil_absorb += my_ha_wethop * product->hops.at(i).amount;
+		} else if (product->hops.at(i).form == HOP_FORMS_CRYO) {
+		    product->boil_absorb += my_ha_t45 * product->hops.at(i).amount;
 		}
 	    } else if (product->hops.at(i).useat == HOP_USEAT_DRY_HOP) {
-		if (product->hops.at(i).form == HOP_FORMS_PELLET || product->hops.at(i).form == HOP_FORMS_PLUG ||
-                    product->hops.at(i).form == HOP_FORMS_CRYO) {
-                    product->ferment_absorb += 2.67 * product->hops.at(i).amount;
+		if (product->hops.at(i).form == HOP_FORMS_PELLET) {
+                    product->ferment_absorb += my_ha_pellet * product->hops.at(i).amount;
+                } else if (product->hops.at(i).form == HOP_FORMS_PLUG) {
+                    product->ferment_absorb += my_ha_plug * product->hops.at(i).amount;
                 } else if (product->hops.at(i).form == HOP_FORMS_LEAF) {
-                    product->ferment_absorb += 6.01 * product->hops.at(i).amount;
+                    product->ferment_absorb += my_ha_leaf * product->hops.at(i).amount;
+		} else if (product->hops.at(i).form == HOP_FORMS_LEAF_WET) {
+                    product->ferment_absorb += my_ha_wethop * product->hops.at(i).amount;
+                } else if (product->hops.at(i).form == HOP_FORMS_CRYO) {
+                    product->ferment_absorb += my_ha_t45 * product->hops.at(i).amount;
                 }
 	    }
 	}